Merge proposals

Jakob Sigurðsson has no merge proposals.