Merge remote-tracking branch 'remotes/stsquad/tags/pull-travis-updates-010618-1'...