[ticket/63881] Let's get it to actually work this time...
Merge branch 'master' into phpbb-com