Merge pull request #3090 from Nicofuma/ticket/13234

Ticket/13234
Merge pull request #3091 from Nicofuma/ticket/13234-2

Ticket/13234 2
Merge branch 'develop-olympus' into prep-release-3.1.0

Conflicts:
	phpBB/phpbb/session.php
Merge branch 'prep-release-3.1.0' into develop-ascraeus