Merge whitespace fix from 3.2.