Merge branch 'hotfix/1.1.5'
Merge branch 'release/1.2.0'
Fix typo in .travis.yml
Merge branch 'hotfix/1.2.1' into develop