Backported Travis changes.