Update version numbers to 2.1.2
Update ANN
Update docs version number
Merge branch 'version_update' into 2.1