Merge branch 'vendor/ACPICA-UNIX'