Fix typo in .travis.yml
Merge branch 'hotfix/1.2.1'