On the 1.2.x branch:
On the 1.2.x branch:

Merge r1714 (fix issue 93).


git-svn-id: 27b5ccb558f7c01cf17f3647a4fee1b292099690@1716 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845

coapp-packages/serf,coapp-packages/serf,coapp-packages/serf