Fixup convenience credential accessor (1e34705)
Merge branch 'refs/heads/master' into peng/add-accounts-widget