whitespaces fixes
Merge branch 'release/12.0' into release/13.0

Conflicts:
	functions.inc.php