Merge branch 'edge' into fix-missing-namespace

Conflicts:
	ruby/trema/messages/multipart-reply-handler.c
Merge remote branch 'axsh-old/fix-missing-namespace' into fix-missing-namespace