Fix travis.sh.
Fixing travis.sh.
Merge branch 'master' into uiunittests