Merge change I28bad882 into eclair

* changes:
  Fix broken build.