Merge branch 'topic/msnd' into for-linus