Merge branch 'next' into kernel-4.9