Merge branch 'for-4.2-misc' into k.o/for-4.2