Merge proposals

Halldor Sigurdsson has no merge proposals.