1.2 release
Merge branch 'develop'