Merge branch 'bug-1391'
authorBenny Baumann <BenBE@geshi.org>
Tue, 4 Aug 2015 20:12:44 +0000 (22:12 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 4 Aug 2015 20:12:44 +0000 (22:12 +0200)

Trivial merge