Merge "Fix to compile for windows"