Merge 3.19-rc5 into char-misc-next