Merge "Fix Javadoc typo"