Merge branch 'master' into paz-927
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 9 Sep 2014 09:08:41 +0000 (11:08 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 9 Sep 2014 09:08:41 +0000 (11:08 +0200)

Trivial merge