Fix travis due to rebase to master