Merge proposals

davelock has no merge proposals.