Merge branch 'ss/safe-create-leading-dir-with-slash'