Merge
Merge branch 'key-management-rewrite' of github.com:GPGTools/Libmacgpg into key-management-rewrite