Updating metadata for 2.1.0
Merge tag '2.1.0' into geezer

Release 2.1.0
Updating source version to 2.2.0-pre
Updating metadata for 2.1.0
Merge branch 'master' into geezer
Updating source version to 2.2.0-pre