Merge branch 'yaz-749'
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 5 Mar 2014 17:31:02 +0000 (18:31 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 5 Mar 2014 17:31:02 +0000 (18:31 +0100)

Trivial merge