Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/11766] Hide edit, quote and delete buttons if topic is locked

Conflicts:
	phpBB/viewtopic.php