Okay, we still need to make the other change, but maybe in a new PR as it just got a different ticket:
http://tracker.phpbb.com/browse/PHPBB3-11816