On the 'cmdline-parse-targets' branch: sync with trunk@r1936560.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/cmdline-parse-targets@1936561 13f79535-47bb-0310-9956-ffa450edef68