numpy/numpy — pull request #2847 by nouiz (2012-12-17 17:08:58+00:00)
Title: Back port 2730

This backport gh-2730 to the 1.7 branches.