Merge branch 'cando' into for-linus