Merged from trunk

diff --cc doc/release-notes/release-3.5.sgml
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/cache_cf.cc
Simple merge

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

diff --cc src/client_side.cc
Simple merge

diff --cc src/client_side.h
Simple merge