Update proxy writer for issue 372
Update ANN for 2.2.1
Update version numbers for 2.2.1
Merge pull request #373 from andrewcollette/issue_372

Update proxy writer for issue 372
Merge branch '2.2_updates' into 2.2
Merge branch '2.2'