Merge change I09282f5b into eclair

* changes:
  Fix the build (hopefully.)