Merge in master branch
Update Travis config