On the 'auth-notification' branch: cherry-pick r1485313 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/auth-notification@1485314 13f79535-47bb-0310-9956-ffa450edef68