Merge branch 'upstream-master'

Conflicts:
	administrator/components/com_admin/sql/updates/mysql/3.2.0.sql
Merge remote-tracking branch 'origin/master'

Conflicts:
	administrator/components/com_admin/sql/updates/mysql/3.2.0.sql
Manually resolve conflict in administrator/components/com_admin/sql/updates/mysql/3.2.0.sql