Merge from upstream.

diff --cc src/cache_cf.cc
Simple merge

diff --cc src/cf.data.pre
Simple merge

diff --cc src/client_side_reply.cc
Simple merge

diff --cc src/protos.h
Simple merge