Merge remote branch 'origin/master' into onload
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 3 Jan 2014 15:44:53 +0000 (15:44 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 3 Jan 2014 15:44:53 +0000 (15:44 +0000)

Trivial merge