Fixup ticket/10772 develop-olympus

This patch should be merged without effect on develop.

http://tracker.phpbb.com/browse/PHPBB3-10772

#1398 #1516