On the 10Gb branch: Ketchup merge from /trunk up to revision 1390956.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/10Gb@1390960 13f79535-47bb-0310-9956-ffa450edef68