Merge tag 'v3.14-rc6' into devel

Linux 3.14-rc6