removed closing tags because they are not needed according to php.net
Merge branch 'bugid-68505' into dev