Merge branch 'bug-1053' into bug-1042
authorBenny Baumann <BenBE@geshi.org>
Wed, 29 Apr 2015 18:43:16 +0000 (20:43 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 29 Apr 2015 18:43:16 +0000 (20:43 +0200)

Trivial merge