Merge branch 'ticket/13138-2' into ticket/13138-asc

Conflicts:
	phpBB/phpbb/session.php
[ticket/13188] Add missing where clause to post_id query in sphinx index

PHPBB3-13188
[ticket/13188] Correctly format string concatenation

PHPBB3-13188
Merge branch 'develop-olympus' into develop-ascraeus

* develop-olympus:
  [ticket/13138] Do not use cookie data and autologin while forcing a user_id

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

* develop-ascraeus:
  [ticket/13138] Do not use cookie data and autologin while forcing a user_id
Merge pull request #3048 from naderman/ticket/13188

[ticket/13188] Add missing where clause to post_id query in sphinx index
Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/13188] Correctly format string concatenation
  [ticket/13188] Add missing where clause to post_id query in sphinx index
Merge pull request #3040 from nickvergessen/ticket/13138-asc

[3.1] Ticket/13138 Only use cookie data when we do not force a user_id

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