Chris Havlin

oops, just merged #4904 and this one automatically closed. but since that PR only covered the simpler case when weight_field is not None, this issue should stay open, ya?

we've got one approval and I'm pretty sure @neutrinoceros 's comments have been addressed, so let's get this in before it goes stale again...