Merge "Windows build fixes" into devel/master