Merge branch 'ticket/10772' into ticket/develop/10772
[ticket/10772] 3.1 specific code

PHPBB3-10772