2.2.0 readiness
Merge branch 'releases/2.2.0'

2.2.0 readiness
Bump to dev version (2.2.1dev)
Merge branch 'version/bump'

bump to dev version