Change the .travis.yml deployment command.
Merge two branches.