Merge branch 'gnupg_work'