aj
Merge remote-tracking branch 'origin/master'

Conflicts:
	basic-install-script.sh