Merge branch 'master' into rkh-cancel-build

Conflicts:
	travis.gemspec
Merge branch 'rkh-cancel-build' of https://github.com/travis-ci/travis into rkh-cancel-build