Merge "Fix problem with JavaDoc"