Merge branch 'mm/credential-libsecret'