Updated Travis CI script.
Merge branch 'master' into refactor/handlers