version bump
Merge branch 'release/2.1.0.2' into develop

* release/2.1.0.2:
  version bump