Merge "Fix a doc typo." into jb-mr2-dev