Backport 1.7 3418#3716

charris merged 1 commit intonumpy:maintenance/1.7.xnumpy/numpy:maintenance/1.7.xfrom

charris:backport-1.7-3418charris/numpy:backport-1.7-3418Copy head branch name to clipboard