Merge branch 'develop' into ticket/11620

Conflicts:
	phpBB/includes/captcha/captcha_factory.php
[ticket/11620] Minor indentation changes and comment clarity

PHPBB3-11620