updated numpy link.
Merge remote-tracking branch 'upstream/staging' into staging
Unresolved regions: 2 cases out of 3