Merge 3.17-rc5 into tty-next