Merge branch 'master' of github.com:lenzcom/ruby-build-scripts

Conflicts:
	bootstrap.sh