more for upgrade script
more for upgrade script


Former-commit-id: a66f42cc76d401264af70c386ca820e80c1a9e6c [formerly 528fda99e6429f65ab92786631b80700827666d3]
Former-commit-id: f7ee0c47bb22ac2b4f729c618910bf77fd19495b
andrewplummer/Sugar,andrewplummer/Sugar,romancow/Sugar,romancow/Sugar