Merge "Fix javadoc"