Merge proposals

Heimdal has no merge proposals.