Merge proposals

Olafur Gudmundsson has no merge proposals.