Merge branch 'develop' into ticket/11620
[ticket/11620] Minor indentation changes and comment clarity

PHPBB3-11620
[ticket/11620] Changed incorrect global variable

PHPBB3-11620