numpy/numpy — pull request #2784 by certik (2012-12-04 02:06:02+00:00)
Title: Backport #2780

Backport #2780. Only merge if tests pass.