Post-release fiddling -- prep for 2.2 final.
4 files changed