Merge pull request #624 from hcavarsan/hcavarsan/upgrade-keyring