Merge proposals

hoe-packaging has no merge proposals.