Merge tag 'v3.18-rc5' into devel

Linux 3.18-rc5