Merge "Fix javadoc reference"