Merge branch 'release/2.0.1g' into develop

* release/2.0.1g:
  Update filesums for release
Bump version for release
Merge branch 'release/2.1.0'

* release/2.1.0:
  Bump version for release