Merge branch 'master' into next

diff --cc dccp_recv.c
Simple merge

diff --cc filter.c
Simple merge

diff --cc http_recv.c
Simple merge

diff --cc udp_recv.c
Simple merge