Merge remote-tracking branch 'origin/master' into hh-fix-stu…
Conflicts:
lib/travis/worker/job/runner.rb
AMD64
no language set
Git