Merge 3.7-rc6 into tty-next