Merge pull request #825 from eimlav/dirmngr-fix