Merge branch 'master' into paz-927
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 3 Mar 2014 15:06:09 +0000 (16:06 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 3 Mar 2014 15:06:09 +0000 (16:06 +0100)

Trivial merge