Merge remote-tracking branch 'github-imkingdavid/task/functional' into develop-olympus

By David King
via David King
* github-imkingdavid/task/functional:
  [task/functional] Use proper format for @var doc blocks.
  [task/functional] Fix $lang_path variable
  [task/functional] Change property visibility, remove globals, reword comment
  [task/functional] Make sure missing language values are handled properly
  [task/functional] Increase code coverage for functional tests
Merge branch 'develop-olympus' into develop

By David King
via David King (1) and Nils Adermann (1)
* develop-olympus:
  [task/functional] Use proper format for @var doc blocks.
  [task/functional] Fix $lang_path variable
  [task/functional] Change property visibility, remove globals, reword comment
  [task/functional] Make sure missing language values are handled properly
  [task/functional] Increase code coverage for functional tests

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
[ticket/10907] Mark (var)binary tests as incomplete on non-MySQL DBMSes.

PHPBB3-10907
Merge remote-tracking branch 'github-bantu/ticket/10907' into develop-olympus

By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10907:
  [ticket/10907] Mark (var)binary tests as incomplete on non-MySQL DBMSes.
Merge branch 'develop-olympus' into develop

By Andreas Fischer
via Andreas Fischer (1) and Nils Adermann (1)
* develop-olympus:
  [ticket/10907] Mark (var)binary tests as incomplete on non-MySQL DBMSes.
[ticket/10905] Last topic title for subsilver2

PHPBB3-10905
[ticket/10855] Fixed a couple issues in coding guidelines.

PHPBB3-10855
[ticket/10789] Remove unnecessary variables from PM print - prosilver

PHPBB3-10789
Merge PR #817 branch 'mvinny/ticket/10905' into develop

* mvinny/ticket/10905:
  [ticket/10905] Last topic title for subsilver2
[ticket/10912] Default last post subject to empty lacking last post info

PHPBB3-10912
[ticket/10909] Also test develop-olympus with low PHP 5.3 version on travis.

Also test develop-olympus with low PHP 5.3 version (i.e. PHP 5.3.3) on travis.

PHPBB3-10909
Merge branch 'ticket/10909' into develop-olympus

* ticket/10909:
  [ticket/10909] Also test develop-olympus with low PHP 5.3 version on travis.
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10909] Also test develop-olympus with low PHP 5.3 version on travis.

Conflicts:
	.travis.yml
[ticket/10908] Download files only up to max_upload_filesize if limit is 0

PHPBB3-10908
[ticket/10913] Redirect to index if session id is required but was not sent

PHPBB3-10913
[ticket/10550] Sort not installed styles list in the styles section of the ACP.

PHPBB3-10550
Merge remote-tracking branch 'imkingdavid/ticket/10912' into develop

* imkingdavid/ticket/10912:
  [ticket/10912] Default last post subject to empty lacking last post info
[ticket/10908] Document that 0 filesize configuration means limited by PHP

PHPBB3-10908
Merge remote-tracking branch 'github-dhruv/ticket/10308' into develop

By Dhruv Goel
via Dhruv Goel
* github-dhruv/ticket/10308:
  [ticket/10308] fixes indentation
  [ticket/10308] fixes language variable name
  [ticket/10308] makes variable boolean
  [ticket/10308] fixes sql query, limit it to 1
  [ticket/10308] fixes user deletion if no posts
  [ticket/10308] renames language key to USER_NO_POSTS_DELETE
  [ticket/10308] fix language and user's total posts
  [ticket/10308] fixes language entity.
  [ticket/10308] Displays message to user if there are no posts.
  [ticket/10308] disable retain/ delete posts option when deleting a user
Merge remote-tracking branch 'github-dhruv/ticket/10308' into develop-olympus

By Dhruv Goel
via Dhruv Goel
* github-dhruv/ticket/10308:
  [ticket/10308] fixes indentation
  [ticket/10308] fixes language variable name
  [ticket/10308] makes variable boolean
  [ticket/10308] fixes sql query, limit it to 1
  [ticket/10308] fixes user deletion if no posts
  [ticket/10308] renames language key to USER_NO_POSTS_DELETE
  [ticket/10308] fix language and user's total posts
  [ticket/10308] fixes language entity.
  [ticket/10308] Displays message to user if there are no posts.
  [ticket/10308] disable retain/ delete posts option when deleting a user