Merge 3.16-rc5 into tty-next.