Merge "Update .travis.yml" into stable/fraser