Merge whatsnew fixes with 3.2.