Merge branch 'public-travis'

[Finishes #67008986]