Merge remote-tracking branch 'origin/patches-2.0'

diff --cc buffer.c
Simple merge

diff --cc buffer_iocp.c
Simple merge

diff --cc bufferevent_async.c
Simple merge

diff --cc evbuffer-internal.h
Simple merge