Bring branch tc-merge-notify up to trunk r33985.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/tc-merge-notify@874060 13f79535-47bb-0310-9956-ffa450edef68