Merge change I89c40f50 into eclair

* changes:
  fix a javadoc build breakage