Merged from parent (trunk r11700, v3.2.0.11+).

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

diff --cc src/client_side.cc
Simple merge

diff --cc src/format/Format.cc
Simple merge

diff --cc src/neighbors.cc
Simple merge