Bumped develop version to 2.1.0 beta. Do not merge this change to master until we are ready for release.
Merge pull request #888 from timlinux/develop

Bumped develop version to 2.1.0 beta. Do not merge this change to master...