Bump version for release
Merge branch 'release/2.1.0' into develop

* release/2.1.0:
  Bump version for release