Preparing for 1.2 release
Fix crash when upgrading from 1.1.1 to 1.2
Merge branch 'release/1.2' into develop