OPS: backported travis from master