numpy/numpy — pull request #2820 by certik (2012-12-14 16:23:41+00:00)
Title: Backport2793

Backport of #2793.