Merge origin/staging into icons

Conflicts:
	administrator/templates/isis/css/template-rtl.css
	media/jui/css/bootstrap-rtl.css
	media/jui/less/bootstrap-rtl.less
Merge origin/icons into icons