Merge remote branch 'origin/patches-2.0'

diff --cc configure.in
Simple merge

diff --cc evutil.c
Simple merge

diff --cc ipv6-internal.h
Simple merge

diff --cc util-internal.h
Simple merge