Merge pull request #811 from asteven/issue/810

no need to break unix just for windows ;-)
Merge remote-tracking branch 'upstream/master'