Merge branch 'master' into com_config_post_modifications

Conflicts:
	components/com_config/view/html/cms.php