RC1
Merge remote-tracking branch 'origin/master'

Conflicts:
	adm/style/acp_upload_extensions.html