update version to 2.1.0
Merge branch '2.1' into release_2.1.1_fixes