Fixing travis_build.sh.
Merging master.