Update ANN for 2.2.1
Update version numbers for 2.2.1
Merge branch '2.2_updates' into 2.2