[ticket/11613] Allow cookies to work on netbios domains

PHPBB3-11613
[ticket/13391] subsilver2 poll options must have a setting of 1 when editing a post

PHPBB3-13391
[ticket/13393] Call user->lang function directly

PHPBB3-13393
Merge remote-tracking branch 'Prosk8er/ticket/13391' into develop-ascraeus

* Prosk8er/ticket/13391:
  [ticket/13391] subsilver2 poll options must have a setting of 1 when editing a post
Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/13391] subsilver2 poll options must have a setting of 1 when editing a post

Conflicts:
	phpBB/styles/subsilver2/template/posting_poll_body.html
Merge pull request #3188 from marc1706/ticket/11613

[ticket/11613] Allow cookies for domains without dots

* marc1706/ticket/11613:
  [ticket/11613] Allow cookies to work on netbios domains
Merge branch 'develop-olympus' into develop-ascraeus

* develop-olympus:
  [ticket/11613] Allow cookies to work on netbios domains
Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/11613] Allow cookies to work on netbios domains
[ticket/13381] Allow ' *' in the doc blocks (especially the header files)

PHPBB3-13381
Merge pull request #3194 from Nicofuma/ticket/13381

[ticket/13381] Allow ' *' in the doc blocks (especially the header files)
Merge branch 'develop-ascraeus' into develop
Merge pull request #3192 from Elsensee/ticket/13393

[ticket/13393] Call user->lang function directly
Merge branch 'develop-ascraeus' into develop
[ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php

PHPBB3-13405
Merge pull request #3204 from rxu/ticket/13405

[ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php

* rxu/ticket/13405:
  [ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php
Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php
[ticket/13396] Normalize multibyte characters in attachment file names.

PHPBB3-13396
[ticket/13400] Information text if the server load id high at search

PHPBB3-13400
Merge branch 'ticket/13400' into develop-ascraeus
Merge branch 'develop-ascraeus' into develop