Original paths were fine
Merge branch 'master' into windows