Merge remote-tracking branch 'waldi/keyring-ssl'