Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify