Merge 4.2-rc1 into MTD -next