Merge "Fix funky javadoc"