Merge branch 'bug-1047' into bug-1055 bug-1055
authorFelix Dörre <felix@dogcraft.de>
Tue, 5 May 2015 18:32:24 +0000 (20:32 +0200)
committerFelix Dörre <felix@dogcraft.de>
Tue, 5 May 2015 18:32:24 +0000 (20:32 +0200)

Trivial merge