Merge "Typo in Javadoc"