Merge proposals

eamon has no merge proposals.