Merge branch 'es/name-hash-no-trailing-slash-in-dirs'