Merge proposals

Dominic Rivest has no merge proposals.