Merge branch 'dev'
Update .travis.yml
Update .travis.yml
Merge branch 'dev'