Update changelog
Bump version number
Merge branch 'release/v1.0.2' into v1.0.x
Merge branch 'v1.0.x'