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

Conflicts:
	installation/sql/mysql/joomla.sql
	installation/sql/postgresql/joomla.sql
	installation/sql/sqlazure/joomla.sql