Merge branch 'bug-1316' into bug-1042
authorBenny Baumann <BenBE@geshi.org>
Tue, 2 Jun 2015 20:01:21 +0000 (22:01 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 2 Jun 2015 20:01:21 +0000 (22:01 +0200)

Trivial merge