Merge remote-tracking branch 'origin/master' into test

Conflicts:
	bin/deploy.sh
Merge remote-tracking branch 'origin/master' into test