Merge proposals

Sigurjon Jonsson has no merge proposals.