Merge proposals

Jóhann Sigurðsson has no merge proposals.