Merge proposals

david.h has no merge proposals.