Merge "Fix typos in documentation"