Merge branch 'next' into for-linus

Merge first round of changes for 3.13 merge window.