Merge branch '2788_mcedit_aspell'