Merge branch 'release/1.2.0' into develop
Fix travis
Merge branch 'develop'