Merge tag 'v4.2-rc5' into devel

Linux 4.2-rc5