Merge "Javadoc fix, correct typo"