Merge remote branch 'kc/new/for-3.4/spelling' into kcmaster