Fix to the PGP key validation tool, fixes #284
Merge branch 'hotfix-2.2.39'