Merge branch 'mp-629'
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 1 Oct 2015 08:49:49 +0000 (10:49 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 1 Oct 2015 08:49:49 +0000 (10:49 +0200)

Trivial merge