Merge branch 'next' into for-linus

Second round of updates for 3.20.