Pull context sharing fix for MS-Windows into kleinerm/master.