Merge pull request #12755 from cbartlett/master

Remove extra whitespace