bugfix - win32
Merge branch 'master' of https://github.com/atom/atom