Bump to 2.2.1dev
Merge branch 'version/bump'

Bump to 2.2.1dev