numpy/numpy — pull request #4157 by juliantaylor (2013-12-30 14:52:10+00:00)
Title: Backport fixes

backport #4094, #4051, #4124, #4020 to 1.7.x