Finish pgp-key-handling
Merged 'dev'.