bump version
Merge branch 'release/2.0.2' into develop
more git gymnastics
Merge branch 'release/2.0.3' into develop