Merge pull request #23 from davosmith/patch-3

CONTRIB-4994 fix upgrade for sites with large numbers of questions