Merge branch 'release/1.2.0' into develop
Travis fix
Bump
Merge branch 'release/1.2.1'