2.3.2-staging

[Richard Kimberly Heck]

I have gone ahead and marked all the bugs fixed in this branch as
"fixedinstable". Please do so as well with future commits. We can tell
these apart from the 2.3.1 bugs by the milestone.

Riki