Merge from trunk

diff --cc configure.in
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/comm.cc
Simple merge

diff --cc src/forward.cc
Simple merge

diff --cc src/neighbors.cc
Simple merge

diff --cc src/protos.h
Simple merge