Merge 3.2.1 release changes into default branch (a null merge except for the new tag.)