Merge branches 'apei', 'bz-13195' and 'doc' into acpi