Update .travis.yml
Fix bad timezone
Merge branch 'master' into 1.0