Commit of main to synchronize with davidmoten/rtree