Merge change Iafbeb31b into eclair-mr2

* changes:
  Maybe really fix windows build.