Ticket/11745

Contains https://github.com/phpbb/phpbb3/pull/1617

http://tracker.phpbb.com/browse/PHPBB3-11745