Merge change I6b618094 into eclair

* changes:
  Fix build.