fix travis build
merged travis fix
merged