[ticket/11860] htaccess: Support for Apache 2.4's "Require" syntax.

PHPBB3-11860
[ticket/12254] Better language switching on registration page

PHPBB3-12254
[ticket/12254] Stop using deprecated request_var in user class

PHPBB3-12254
[ticket/12254] Use new set_lang var to avoid conflict with change_lang

PHPBB3-12254
[ticket/12254] Add set_lang var changes to subsilver2 files

PHPBB3-12254
[ticket/12254] Persist set_lang after reg only if changed from default

PHPBB3-12254
[ticket/12254] Use 'language' instead of 'set_lang' as the variable name

PHPBB3-12254
[ticket/12254] No longer need to add change_lang to the URL params

PHPBB3-12254
[ticket/12474] Error messages should be displayed with <error> tag

PHPBB3-12474
[ticket/12475] Error in db:update console command

PHPBB3-12475
Merge pull request #2380 from Nicofuma/ticket/12474

[ticket/12474] The console command for updating/migrating the db should display the error with the <error> tag

* Nicofuma/ticket/12474:
  [ticket/12474] Error messages should be displayed with <error> tag
Merge pull request #2381 from Nicofuma/ticket/12475

[ticket/12475] Undefined variable $log in db:migrate console command

* Nicofuma/ticket/12475:
  [ticket/12475] Error in db:update console command
[ticket/12475] Load extension migrations on cli updater too

PHPBB3-12475
[ticket/12475] Tabs, spaces, ...

PHPBB3-12475
[ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3.

PHPBB3-12429
Merge branch 'ticket/12429' into ticket/12429-develop

* ticket/12429:
  [ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3.

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
[ticket/12254] Use a cookie instead of SID to store language selection

PHPBB3-12254
[ticket/12254] Add subsilver2 support for cookie storage instead of SID

PHPBB3-12254
Merge remote-tracking branch 'github-vse/ticket/12254' into develop-ascraeus

* github-vse/ticket/12254:
  [ticket/12254] Add subsilver2 support for cookie storage instead of SID
  [ticket/12254] Use a cookie instead of SID to store language selection
  [ticket/12254] No longer need to add change_lang to the URL params
  [ticket/12254] Use 'language' instead of 'set_lang' as the variable name
  [ticket/12254] Persist set_lang after reg only if changed from default
  [ticket/12254] Add set_lang var changes to subsilver2 files
  [ticket/12254] Use new set_lang var to avoid conflict with change_lang
  [ticket/12254] Stop using deprecated request_var in user class
  [ticket/12254] Better language switching on registration page
Merge remote-tracking branch 'github-bantu/ticket/12429' into develop-olympus

* github-bantu/ticket/12429:
  [ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3.