update travis-build
Merge branch 'master' into features/docker-cpusets

Conflicts:
	Gemfile.lock