Another windows build fix
Merge remote-tracking branch 'ace/win-fix'