fix wrap bug
Merge pull request #910 from dimagi/oops

fix wrap bug
fix an erro introduced by find-replace
Merge pull request #913 from dimagi/hotfix

fix an erro introduced by find-replace
Merge branch 'master' into stats-rep
Merge branch 'stats-rep' into s2