Merge branch 'mp-564'
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 21 Oct 2014 07:07:32 +0000 (09:07 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 21 Oct 2014 07:07:32 +0000 (09:07 +0200)

Trivial merge