Merge branch 'staging' of https://github.com/joomla/joomla-cms into languagerefactor

Conflicts:
	plugins/system/languagefilter/languagefilter.php