Merge branch 'hotfix/1.2.1'
Update .travis.yml
Merge branch 'hotfix/1.2.2' into develop