Merge branch 'topic/midi' into for-linus