Use isPathSeparator
Merge branch 'maintain/1.4'