Merge proposals

Hoffmann has no merge proposals.