Merge pull request #2238 from alex/reduce-duplication

De-duplicate OIDs for signatures