Merge pull request #649 from sipa/comprpubkey