Use Path.DirectorySeparator in Globbing
Merge branch 'master' into develop