Merge branch 'master' into yaz-781
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 18 Aug 2014 13:28:14 +0000 (15:28 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 18 Aug 2014 13:28:14 +0000 (15:28 +0200)

Trivial merge