Merge branch 'next' into for-linus

Prepare second round of updates for 4.1 merge window.