Merge remote branch 'origin/onload'
authorWolfram Schneider <wosch@indexdata.dk>
Mon, 6 Jan 2014 11:54:03 +0000 (11:54 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Mon, 6 Jan 2014 11:54:03 +0000 (11:54 +0000)

Trivial merge