am ee7c4739: Merge change Ic1eff784 into eclair

Merge commit 'ee7c473929c62bb9f9f0e21e9ca850174b9041a1' into eclair-mr2

* commit 'ee7c473929c62bb9f9f0e21e9ca850174b9041a1':
  Fix script (and build)