Merge "Correct javadoc usage"