Fixed process killing on Windows
Merge branch 'master' into channel-patch