Merge change I06fb2c1c into eclair-mr2

* changes:
  Hopefully fix Windows build