Merge commit 'b901f0c6dd4c833e4d5a0aa409066d25762abbbb' * commit 'b901f0c6dd4c833e4d5a0aa409066d25762abbbb': Hopefully fix Windows build
Merge commit 'b901f0c6dd4c833e4d5a0aa409066d25762abbbb' * commit 'b901f0c6dd4c833e4d5a0aa409066d25762abbbb': Hopefully fix Windows build