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