Merge pull request #2244 from benthecarman/signature-size