Bumped version number to 2.1b1
Merge branch 'release-2.1b1' into develop