Merge branch 'master' of https://github.com/gitlabhq/gitlab-ci-runner

Conflicts:
	lib/build.rb