Merge pull request #1018 from nico/spell