Merge proposals

hamish has no merge proposals.