Merge branch 'mc/credential-helper-www-authenticate'