Fix compiler warnings: merge serf trunk rev. 2273
Merge HEAD and serf change.