Merge tag 'v3.15-rc4' into devel

Linux 3.15-rc4