Merge tag 'v3.18' into for_next

Linux 3.18