Merge change I7a39c564 into eclair

* changes:
  Fix docs error