Merge branch 'topic/riptide' into for-linus