Merge branch 'bug-1396'
authorBenny Baumann <BenBE@geshi.org>
Sun, 9 Aug 2015 20:26:17 +0000 (22:26 +0200)
committerBenny Baumann <BenBE@geshi.org>
Sun, 9 Aug 2015 20:26:17 +0000 (22:26 +0200)

Trivial merge