There's still runtime errors related to cups not being able to open PPDs, so don't merge as-is. I am still working on it.