Comment 2 for bug 1411106

Oh, and the branch also uses the org_unit ancestor / descendants functions to try and do a better job of getting the right list of org_units to pull from, when you specify an org_unit at the command line.