numpy/numpy — pull request #2900 by certik (2013-01-10 03:20:15+00:00)
Title: Backport2886and7

This backports #2886 and #2887 into 1.7. Fixes #2889.