Merging final changes made to 2.2-compatch into the new 2.3-compatch

Just synchronizing.  The branch 2.2-compatch is now effectively frozen.