Merge branch 'release/1.0.1' into develop
Prepare for release 1.0.2
Merge branch 'release/1.0.2'