Merge pull request #2460 from Nicofuma/ticket/11224

[ticket/11224] SQL cache destroy does not destroy queries to tables joined
[ticket/13138] Do not use cookie data and autologin while forcing a user_id

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

Conflicts:
	phpBB/phpbb/session.php
[ticket/12568] Replace modifications explanation with extensions.

PHPBB3-12568
[ticket/12568] Update path to language pack installation page.

PHPBB3-12568
[ticket/12568] Update style installation instructions.

PHPBB3-12568
[ticket/12568] Remove various unnecessary references to phpBB3.

PHPBB3-12568
[ticket/12568] Fix typo - "directorie" -> "directories"

PHPBB3-12568
[ticket/12568] Update GitHub link.

PHPBB3-12568
[ticket/12568] The "Purge cache" option in the Customise tab no longer exists.

PHPBB3-12568
[ticket/12568] Fix awkward use of "phpBB Limited."

PHPBB3-12568
[ticket/13186] Don't show link on post count when search disabled

PHPBB3-13186
Merge pull request #2960 from prototech/ticket/12568

[ticket/12568] Update user docs
[ticket/13187] Fix HTML validity of INSTALL.html

PHPBB3-13187
[ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility

PHPBB3-13168
[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 pull request #3048 from naderman/ticket/13188

[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