Switching travis from test branch back onto dev-master.