Merge branch 'next' into for-linus

Prepare input updates for 4.13 merge window.