numpy/numpy — pull request #3899 by juliantaylor (2013-10-12 12:08:29+00:00)
Title: backport PR #3885 to 1.7.x

backport of #3885