Merge remote branch 'github/http_listener'

Conflicts:
	http.c

diff --cc http-internal.h
Simple merge

diff --cc http.c
Simple merge