Merge branch 'acpi-properties'