Merge proposals

bruce has no merge proposals.