[Numpy-discussion] Yet more merges in maintenance/1.5.x