Merge proposals

Jon Dufresne has no merge proposals.