Merge branch 'release/v1.0.1' into develop
Clumsy me, all fixed now.
Bump version.
Merge branch 'release/v1.0.2'