Merge typo fixes with 3.2.