Merge branch 'bug-1046' into bug-1042
authorBenny Baumann <BenBE@geshi.org>
Tue, 12 May 2015 21:50:16 +0000 (23:50 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 12 May 2015 21:50:16 +0000 (23:50 +0200)

Trivial merge