On the ev2-export branch:
Bring up-to-date with trunk.  This picks up fixes for merge test 133.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/ev2-export@1436902 13f79535-47bb-0310-9956-ffa450edef68