Merge 3.2 branch.