Merge branch 'release/2.1.0'
Merge branch 'release/2.1.1'
Update version number in README as well.
Merge branch 'master' into develop