Merge 3.10-rc5 into char-misc-next