fix windows patch
doh
Merge branch 'master' into logan