Merge branch 'release-1.0.2'
Merge branch 'master' into develop