Merge proposals

chris- has no merge proposals.