Merge branch 'master' into dev_http

Conflicts:
	src/Makefile.am
	src/listeningpoint.c