Merge pull request #1879 from reaperhulk/san-dirname

add support for directory name general names