Merge branch 'ticket/11731' into feature/session-storage

Conflicts:
	phpBB/phpbb/session.php