Merge remote-tracking branch 'upstream/master'

Conflicts:
	scripts/composer.sh
	scripts/mailcatcher.sh
	scripts/nodejs.sh
	scripts/rvm.sh
	scripts/zsh.sh