Merge commit '2f6d42fc43dad2b15b3aba4a259ead86241c996f' * commit '2f6d42fc43dad2b15b3aba4a259ead86241c996f': Fix some Javadoc typos.
Merge commit '2f6d42fc43dad2b15b3aba4a259ead86241c996f' * commit '2f6d42fc43dad2b15b3aba4a259ead86241c996f': Fix some Javadoc typos.