Sync stable travis config with master