Merge branch 'master' into spell-check