Merge commit 'fml/master' into next

diff --cc fade.c
Simple merge

diff --cc filter.c
Simple merge

diff --cc recv.c
Simple merge