Merge branch 'thunder-acpi'