Merge branch 'release/v1.2' into develop
Merge pull request #1 from klang/develop

Merge branch 'release/v1.2' into develop