looks straightforward, thanks, can you please run this command and repush so we can merge it into 1.9 and master (assumes origin remote name of offical the numpy repository)

git rebase --onto $(git merge-base origin/master origin/maintenance/1.9.x) $(git merge-base origin/master HEAD)

Done. Not sure how to tell if that changed anything.

it changes the ancestor of the commit to one both master and 1.9.x have in common so we can merge it into both without pulling in extra changes from either. Its a new thing we are trying to simplify the backport process (as now git log maintenance/1.9.x...master --no-merge, git b --contains etc. are useful and git automerging is improved), we'll add documentation soon.