Merge "Fix broken JavaDoc"