Merge branch 'master' into yaz-744
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 25 Feb 2014 20:39:19 +0000 (21:39 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 25 Feb 2014 20:39:19 +0000 (21:39 +0100)

Trivial merge