scipy/scipy — pull request #4167 by dlax (2014-11-18 20:47:37+00:00)
Title: Backport gh-4153

Closes gh-4164