On the 'showing-merge-info' branch: Catch up to trunk@1231929.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/showing-merge-info@1231975 13f79535-47bb-0310-9956-ffa450edef68