Prepare for release 2.1.0.
Merge pull request #920 from ddurnev/Release_2_1_0

Prepare for release 2.1.0.