Merge typo fix from 3.4