Merge "Fix javadoc rendering"