Merge change Ic1eff784 into eclair

* changes:
  Fix script (and build)