Use filesystem-independent separator char
(cherry picked from commit 8e91515)