Merge branch 'master' into async
authorJakub Skoczen <jakub@indexdata.dk>
Thu, 17 Sep 2015 09:05:29 +0000 (11:05 +0200)
committerJakub Skoczen <jakub@indexdata.dk>
Thu, 17 Sep 2015 09:05:29 +0000 (11:05 +0200)

Trivial merge