Merge branch 'develop' for 0.9.2 release