Merge origin/staging into HEAD

Conflicts:
	administrator/components/com_categories/models/fields/modal/category.php
	administrator/components/com_contact/models/fields/modal/contact.php
	components/com_content/helpers/icon.php