I think I'm caught up on porting fixes from the trunk to the release22-maint branch.
Voluminous thanks for the work, Michael!
There are still some bugs in the trunk that need fixing, though. ... [ #501591 ] dir() doc is old
I just reassigned that one to me; Fred is off today, and it's shallow (the docstring got updated to a correct state when I implemented 2.2 dir() changes, but somehow or other the docs didn't). I'll fix this before I pass out tonight.