Merged PackageKit branch