Merge branch 'topic/echoaudio' into for-linus