Stable 3.2.5 port.  Still needs migration testing.