Merge branch 'topic/cleanup' into for-linus