try to fix .travis.yml
Merge remote-tracking branch 'origin/master' into topic/universal-traits