travis is getting slower
catch up with master