Merge 3.2.x back into master