Merge pull request #1010 from sr-gi/enforce_signature_length