Update version and documentation for 2.1.0 release
Merge branch 'release/2.1.0' into develop