Merge branch 'xq/credential-osxkeychain'