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

PHPBB3-11860
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.
[ticket/12478] Re-add contact field events in ucp_pm_viewmessage.html.

PHPBB3-12478
[ticket/12478] Add contact field events to viewtopic_body.html.

PHPBB3-12478
[ticket/12477] Fix logic to prevent admin-deactivated users from getting PM's.

PHPBB3-12477
[ticket/12477] Tab instead of spaces.

PHPBB3-12477
Merge pull request #2384 from prototech/ticket/12477

[ticket/12477] Fix logic to prevent admin-deactivated users from getting PM's.

* prototech/ticket/12477:
  [ticket/12477] Tab instead of spaces.
  [ticket/12477] Fix logic to prevent admin-deactivated users from getting PM's.
Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12477] Tab instead of spaces.
  [ticket/12477] Fix logic to prevent admin-deactivated users from getting PM's.
[ticket/12480] Only load config/routing.yml from extensions route

PHPBB3-12480
[ticket/12480] Add subfolder/config/routing.yml which should not be found

PHPBB3-12480
[ticket/12480] Remove unused use statements

PHPBB3-12480
Merge pull request #2388 from nickvergessen/ticket/12480

[ticket/12480] Only load config/routing.yml from extensions route

* nickvergessen/ticket/12480:
  [ticket/12480] Remove unused use statements
  [ticket/12480] Add subfolder/config/routing.yml which should not be found
  [ticket/12480] Only load config/routing.yml from extensions route
Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12480] Remove unused use statements
  [ticket/12480] Add subfolder/config/routing.yml which should not be found
  [ticket/12480] Only load config/routing.yml from extensions route
Merge pull request #2385 from prototech/ticket/12478

Add contact field before/after events.
Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12478] Add contact field events to viewtopic_body.html.
  [ticket/12478] Re-add contact field events in ucp_pm_viewmessage.html.
[ticket/12482] Fixed undefined variable: data.

PHPBB3-12482
[ticket/10521] Allow language switching by URL parameter

PHPBB3-10521
Merge pull request #2389 from prototech/ticket/12482

[ticket/12482] Fixed undefined variable: data.

* prototech/ticket/12482:
  [ticket/12482] Fixed undefined variable: data.
Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12482] Fixed undefined variable: data.
[ticket/12382] Allow nested loops in included files.

They have to reference the fully qualified loop name in BEGIN and END.

PHPBB3-12382