Merge branch 'develop' for release 1.2.
Merge branch 'develop' for release 1.1
Merge branch 'develop'