Merge branch 'master' into yaz-728
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 29 Jan 2014 15:02:57 +0000 (16:02 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 29 Jan 2014 15:02:57 +0000 (16:02 +0100)

Trivial merge