am 9ddb7df8: Fix build.

Merge commit '9ddb7df88a62a131519264f75f5d6616ee11b6e6' into eclair-mr2

* commit '9ddb7df88a62a131519264f75f5d6616ee11b6e6':
  Fix build.