am b901f0c6: am 484fe4d6: Merge change I06fb2c1c into eclair-mr2

Merge commit 'b901f0c6dd4c833e4d5a0aa409066d25762abbbb'

* commit 'b901f0c6dd4c833e4d5a0aa409066d25762abbbb':
  Hopefully fix Windows build