bug fixes for 1.10.2 release
Merge branch 'master' into develop