Merge commit '73053d973' into smp-hotplug