Merge proposals

graeme has no merge proposals.