Merge proposals

stanley has no merge proposals.