[Numpy-discussion] bug fixes: which branch?