Merge Upstream Fix for Spelling