Merged from parent (trunk r11672, v3.2.0.10+).

diff --cc configure.ac
Simple merge

diff --cc src/Makefile.am
Simple merge

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/format/Tokens.h
Simple merge

diff --cc src/http.cc
Simple merge

diff --cc src/main.cc
Simple merge

diff --cc src/store.cc
Simple merge

diff --cc src/structs.h
Simple merge