Fix tavis yaml, manually merge #486