Merge change Ifc1b1ccb into eclair-mr2

* changes:
  Fix eclipse build