Change .travis.yaml to .travis.yml.
Merge branch 'develop'