Merge proposals

Dan W has no merge proposals.