On the '1.3.x-r1901937' branch: Merge changes from the 1.3.x branch.

git-svn-id: https://svn.apache.org/repos/asf/serf/branches/1.3.x-r1901937@1909355 13f79535-47bb-0310-9956-ffa450edef68