Merge tag 'v3.18-rc4' into x86/cleanups, to refresh the tree before pulling new changes.