apply travis fix from master