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

PHPBB3-11613
[ticket/13381] Fix header intendation of v312.php

PHPBB3-13381
Merge remote-tracking branch 'nickvergessen/ticket/13381' into develop-ascraeus
Merge branch 'develop-ascraeus' into develop
[ticket/13389] Replace pattern with path

PHPBB3-13389
[ticket/13362] Fix cache paths in .gitignore

PHPBB3-13362
Merge pull request #3075 from Senky/ticket/11613

[ticket/11613] Cookies do not work for netbios domain
Merge branch 'develop-ascraeus' into develop
Merge pull request #3185 from Nicofuma/ticket/13389

[ticket/13389] Replace pattern with path
Merge branch 'develop-ascraeus' into develop
Merge pull request #3187 from Nicofuma/ticket/13362

[ticket/13362] Fix cache paths in .gitignore
Merge branch 'develop-ascraeus' into develop
[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
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