Prep for release
Merge branch 'release/1.2' into develop