Bump to 2.1.2dev
Merge branch 'version/bump'

Bump to 2.1.2dev