Fix compilation issue #3443.
Merged with master
Merge branch 'master' of https://github.com/jmozmoz/numpy.git