[mate-base/mate-keyring] Backport patch that fixes Sabayon bug #3939
Merge remote-tracking branch 'upstream/master'