2.3.1-staging Has Been Merged

[Richard Kimberly Heck]

Commits intended for 2.3.1 should now just go to 2.3.x, with my nod, as
usual. Note that 2.3.2-staging is still live.

Richard