Really, actually, merge r23802 and r23803 from trunk to the
artem-soc-work branch.

Branch: artem-soc-work
(I tried to do this in r23805, but botched the copy. Sorry!)




git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/artem-soc-work@863880 13f79535-47bb-0310-9956-ffa450edef68
6 files changed