Merge branch 'develop-olympus' into develop-ascraeus

* develop-olympus:
  [ticket/12540] Fix broken placeholders in language files

Conflicts:
	phpBB/language/en/common.php
	phpBB/language/en/posting.php
	phpBB/language/en/ucp.php
Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12540] Fix broken placeholders in language files