Merge pull request #1862 from reaperhulk/san-uri

add URI general name support