In order to pull..
Merge branch 'master' into uploadctrl
Update 99-install.sh

TODO: Move these elsewhere.
Merge branch 'master' into uploadctrl

Conflicts:
	contrib/autobuild-aoscarchive
	proc/99-install.sh
Merge branch 'uploadctrl'