Updating for release 2.1-rc1
Merge pull request #1 from njt1982/release-2.1-update

Updating for release 2.1-rc1