Fix on KeyboardInterrupt for Windows
Merge branch 'public' into pypy