remove an identical odd namespacing typo
Merge branch 'master' into windows