Merge branch 'jc/gpg-status'