Merge commit '4df43ae4a793ac81d95c0b50967d444ca2d28ffa' * commit '4df43ae4a793ac81d95c0b50967d444ca2d28ffa': fix a javadoc build breakage