Merge my changes from 3.2-rc10 to 3.2

This is kind of a test to see if I can select which commits to merge.