Merge pull request #5490 from CHItA/ticket/15921 [ticket/15921] Fix master build
[ticket/15921] Fix master build PHPBB3-15921