Merge "trivial: fix spelling errors"