Merge proposals

Páll Haraldsson has no merge proposals.