Merge branch 'master' into paz-927
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 6 Mar 2015 10:26:17 +0000 (11:26 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 6 Mar 2015 10:26:17 +0000 (11:26 +0100)

Trivial merge