Merge branch 'master' into next

Conflicts:
	aft.c
	command.c

diff --cc mp3dec_filter.c
Simple merge

diff --cc vss.c
Simple merge