Merge pull request #2036 from greymoth-jp/fix/and-pattern-path-separator