Merge 3.10-rc6 into char-misc-next