Merge branch 'topic/dw' into for-linus