Merge 3.5-rc7 into char-misc-next.