Merge proposals

Benedikt Kristinsson has no merge proposals.