Merge pull request #2863 from alexrp/windows-critsect-debug-info