Merge branch 'spell-check'