Merge this to pull in all Plasma 6 packages
