Merge remote-tracking branch 'naderman/ticket/10663' into develop

* naderman/ticket/10663:
  [ticket/10663] Extension finder should not find subdirs with directory filter
  [ticket/10663] Adding nested directory to finder test
Merge branch 'ticket/raimon/10453' into develop-olympus

* ticket/raimon/10453:
  [ticket/10453] PM viewmessage page is misplacing the online icon
  [ticket/10453] PM viewmessage page is misplacing the online icon
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10453] PM viewmessage page is misplacing the online icon
  [ticket/10453] PM viewmessage page is misplacing the online icon
Merge remote-tracking branch 'nickvergessen/ticket/10630' into develop-olympus

* nickvergessen/ticket/10630:
  [ticket/10630] Use sql_like_expression() method instead of hardcoded LIKE '%x%'
  [ticket/10630] Perform array_unique on authors array before creating the query
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10630] Use sql_like_expression() method instead of hardcoded LIKE '%x%'
  [ticket/10630] Perform array_unique on authors array before creating the query
Merge remote-tracking branch 'nickvergessen/ticket/10456' into develop-olympus

* nickvergessen/ticket/10456:
  [ticket/10456] Add tabindex to subsilver2 captcha
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10456] Add tabindex to subsilver2 captcha
Merge remote-tracking branch 'nickvergessen/ticket/10458' into develop

* nickvergessen/ticket/10458:
  [ticket/10458] Fix xHTML errors when print-viewing PMs
[ticket/10532] Put $total_match_count assignment onto its own line.

PHPBB3-10532
[ticket/10532] Get rid of inline calculation of $start, remove duplicated check

PHPBB3-10532
[ticket/10532] Remove one unnecessary level of if block nesting.

PHPBB3-10532
[ticket/10532] Remove unnecessary parentheses around calculations of addition.

PHPBB3-10532
Merge remote-tracking branch 'rxu/ticket/10532' into develop-olympus

* rxu/ticket/10532:
  [ticket/10532] Remove unnecessary parentheses around calculations of addition.
  [ticket/10532] Remove one unnecessary level of if block nesting.
  [ticket/10532] Get rid of inline calculation of $start, remove duplicated check
  [ticket/10532] Put $total_match_count assignment onto its own line.
  [ticket/10532] Adjust total match count and limit
  [ticket/10532] Fix $start out of range for pre-made searches
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10532] Remove unnecessary parentheses around calculations of addition.
  [ticket/10532] Remove one unnecessary level of if block nesting.
  [ticket/10532] Get rid of inline calculation of $start, remove duplicated check
  [ticket/10532] Put $total_match_count assignment onto its own line.
  [ticket/10532] Adjust total match count and limit
  [ticket/10532] Fix $start out of range for pre-made searches

Conflicts:
	phpBB/search.php
[ticket/10453] Fixing spacing

Fixing spacing

PHPBB3-10453
Merge remote-tracking branch 'cyberalien/ticket/10453' into develop-olympus

* cyberalien/ticket/10453:
  [ticket/10453] Fixing spacing
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10453] Fixing spacing
[ticket/9220] Remove margin on table.table1 so it's centered in the blue box.

The problem here was, that we use width: 100% in combination with the negative
margin. This causes the element to be just moved to the side, so it's not
centered anymore. width: auto would fix this, but it causes strange behaviour
on IE and looks even more ugly. So I decided to just remove the margin at all.
The border is now 1px thicker for all sides.

PHPBB3-9220
[ticket/10672] Fix total post count language string in statistics and feed

PHPBB3-10672
Merge remote-tracking branch 'nickvergessen/ticket/9220' into develop-olympus

* nickvergessen/ticket/9220:
  [ticket/9220] Remove margin on table.table1 so it's centered in the blue box.