Better way to check for Windows atexit
Merge remote-tracking branch 'origin/master'