Merge branch 'release/1.2.0' into develop
Fixed travis yml filename
Merge branch 'release/1.2.1'