Merge gramatical fixes from corydon (bug #3180)