Merge Travis-CI integration into master branch