Merge tag 'v3.16' into next

Linux 3.16