Updated .travis.yml
Merge remote-tracking branch 'parent/2.0' into 2.0