Final commit to synchronize with davidmoten/rtree