CSync: Fix win32 compile
Merge remote-tracking branch 'origin/il' into tmp_master