Fix-up merge issues when bringing in io_new over.
Fix-up merge issues when bringing in io_new over.

pyramania/scipy,surhudm/scipy,felipebetancur/scipy,ndchorley/scipy,cpaulik/scipy,raoulbq/scipy,gfyoung/scipy,trankmichael/scipy,hainm/scipy,lhilt/scipy,zaxliu/scipy,e-q/scipy,vigna/scipy,haudren/scipy,nmayorov/scipy,zxsted/scipy,gdooper/scipy,mortada/scipy,lhilt/scipy,mgaitan/scipy,nvoron23/scipy,juliantaylor/scipy,mgaitan/scipy,Newman101/scipy,befelix/scipy,anielsen001/scipy,josephcslater/scipy,pbrod/scipy,anntzer/scipy,newemailjdm/scipy,chatcannon/scipy,efiring/scipy,ndchorley/scipy,Kamp9/scipy,jjhelmus/scipy,befelix/scipy,aman-iitj/scipy,richardotis/scipy,njwilson23/scipy,scipy/scipy,surhudm/scipy,kalvdans/scipy,Newman101/scipy,fredrikw/scipy,josephcslater/scipy,Dapid/scipy,ChanderG/scipy,fredrikw/scipy,gef756/scipy,jor-/scipy,Kamp9/scipy,mgaitan/scipy,Eric89GXL/scipy,pyramania/scipy,person142/scipy,sauliusl/scipy,FRidh/scipy,nonhermitian/scipy,anielsen001/scipy,nvoron23/scipy,newemailjdm/scipy,ChanderG/scipy,woodscn/scipy,jonycgn/scipy,pbrod/scipy,fernand/scipy,Srisai85/scipy,fredrikw/scipy,pschella/scipy,aman-iitj/scipy,bkendzior/scipy,Shaswat27/scipy,jsilter/scipy,matthew-brett/scipy,sauliusl/scipy,josephcslater/scipy,behzadnouri/scipy,petebachant/scipy,WillieMaddox/scipy,minhlongdo/scipy,hainm/scipy,felipebetancur/scipy,aeklant/scipy,mgaitan/scipy,nvoron23/scipy,vberaudi/scipy,mingwpy/scipy,mingwpy/scipy,hainm/scipy,petebachant/scipy,Dapid/scipy,chatcannon/scipy,felipebetancur/scipy,vhaasteren/scipy,dominicelse/scipy,kalvdans/scipy,vhaasteren/scipy,anntzer/scipy,andyfaff/scipy,mtrbean/scipy,arokem/scipy,efiring/scipy,sriki18/scipy,ChanderG/scipy,aman-iitj/scipy,niknow/scipy,jsilter/scipy,e-q/scipy,argriffing/scipy,sauliusl/scipy,felipebetancur/scipy,bkendzior/scipy,sriki18/scipy,nvoron23/scipy,rmcgibbo/scipy,ales-erjavec/scipy,fredrikw/scipy,teoliphant/scipy,Dapid/scipy,FRidh/scipy,chatcannon/scipy,pyramania/scipy,aarchiba/scipy,sriki18/scipy,tylerjereddy/scipy,gertingold/scipy,pbrod/scipy,mortonjt/scipy,pnedunuri/scipy,gertingold/scipy,matthew-brett/scipy,larsmans/scipy,behzadnouri/scipy,aarchiba/scipy,futurulus/scipy,mortonjt/scipy,jakevdp/scipy,ortylp/scipy,kalvdans/scipy,behzadnouri/scipy,niknow/scipy,Shaswat27/scipy,hainm/scipy,dominicelse/scipy,minhlongdo/scipy,piyush0609/scipy,WarrenWeckesser/scipy,hainm/scipy,pbrod/scipy,rmcgibbo/scipy,felipebetancur/scipy,rmcgibbo/scipy,woodscn/scipy,grlee77/scipy,jamestwebber/scipy,Shaswat27/scipy,matthewalbani/scipy,ilayn/scipy,matthewalbani/scipy,pyramania/scipy,pschella/scipy,WarrenWeckesser/scipy,WillieMaddox/scipy,mdhaber/scipy,petebachant/scipy,jsilter/scipy,cpaulik/scipy,efiring/scipy,jjhelmus/scipy,pnedunuri/scipy,nvoron23/scipy,jjhelmus/scipy,matthewalbani/scipy,endolith/scipy,matthewalbani/scipy,WillieMaddox/scipy,aarchiba/scipy,petebachant/scipy,mortonjt/scipy,Srisai85/scipy,endolith/scipy,WarrenWeckesser/scipy,apbard/scipy,vberaudi/scipy,woodscn/scipy,tylerjereddy/scipy,haudren/scipy,ogrisel/scipy,Gillu13/scipy,teoliphant/scipy,woodscn/scipy,anielsen001/scipy,mingwpy/scipy,trankmichael/scipy,matthew-brett/scipy,njwilson23/scipy,argriffing/scipy,mtrbean/scipy,ndchorley/scipy,maciejkula/scipy,zaxliu/scipy,witcxc/scipy,Stefan-Endres/scipy,dch312/scipy,jakevdp/scipy,dch312/scipy,Eric89GXL/scipy,juliantaylor/scipy,fernand/scipy,Kamp9/scipy,Eric89GXL/scipy,perimosocordiae/scipy,giorgiop/scipy,ortylp/scipy,witcxc/scipy,argriffing/scipy,ales-erjavec/scipy,zxsted/scipy,lhilt/scipy,lukauskas/scipy,lukauskas/scipy,nmayorov/scipy,hainm/scipy,gertingold/scipy,pizzathief/scipy,newemailjdm/scipy,rgommers/scipy,maniteja123/scipy,mingwpy/scipy,vanpact/scipy,jsilter/scipy,cpaulik/scipy,juliantaylor/scipy,jseabold/scipy,njwilson23/scipy,mikebenfield/scipy,vberaudi/scipy,gef756/scipy,mikebenfield/scipy,vhaasteren/scipy,mdhaber/scipy,ogrisel/scipy,vberaudi/scipy,cpaulik/scipy,grlee77/scipy,mdhaber/scipy,maciejkula/scipy,fernand/scipy,chatcannon/scipy,vanpact/scipy,mingwpy/scipy,pizzathief/scipy,dch312/scipy,apbard/scipy,Kamp9/scipy,gfyoung/scipy,tylerjereddy/scipy,raoulbq/scipy,maniteja123/scipy,kalvdans/scipy,ndchorley/scipy,lhilt/scipy,gef756/scipy,WarrenWeckesser/scipy,sonnyhu/scipy,piyush0609/scipy,trankmichael/scipy,surhudm/scipy,FRidh/scipy,scipy/scipy,andyfaff/scipy,bkendzior/scipy,jonycgn/scipy,njwilson23/scipy,argriffing/scipy,fernand/scipy,gertingold/scipy,sonnyhu/scipy,gef756/scipy,witcxc/scipy,ilayn/scipy,ilayn/scipy,chatcannon/scipy,cpaulik/scipy,andim/scipy,sriki18/scipy,ilayn/scipy,larsmans/scipy,sauliusl/scipy,juliantaylor/scipy,richardotis/scipy,befelix/scipy,FRidh/scipy,matthewalbani/scipy,mortada/scipy,argriffing/scipy,petebachant/scipy,jseabold/scipy,zaxliu/scipy,pnedunuri/scipy,jseabold/scipy,vhaasteren/scipy,anntzer/scipy,Srisai85/scipy,mikebenfield/scipy,scipy/scipy,njwilson23/scipy,andyfaff/scipy,Gillu13/scipy,niknow/scipy,andim/scipy,WarrenWeckesser/scipy,mortonjt/scipy,larsmans/scipy,chatcannon/scipy,piyush0609/scipy,larsmans/scipy,Eric89GXL/scipy,giorgiop/scipy,andim/scipy,zerothi/scipy,petebachant/scipy,pnedunuri/scipy,apbard/scipy,endolith/scipy,niknow/scipy,gef756/scipy,jamestwebber/scipy,maniteja123/scipy,dominicelse/scipy,ChanderG/scipy,aeklant/scipy,anntzer/scipy,Gillu13/scipy,mhogg/scipy,vhaasteren/scipy,Shaswat27/scipy,richardotis/scipy,josephcslater/scipy,sonnyhu/scipy,lukauskas/scipy,anielsen001/scipy,vigna/scipy,vigna/scipy,jseabold/scipy,giorgiop/scipy,newemailjdm/scipy,mgaitan/scipy,gef756/scipy,rgommers/scipy,person142/scipy,arokem/scipy,ortylp/scipy,ogrisel/scipy,richardotis/scipy,mortada/scipy,jor-/scipy,maciejkula/scipy,FRidh/scipy,mhogg/scipy,lukauskas/scipy,Stefan-Endres/scipy,ales-erjavec/scipy,mdhaber/scipy,larsmans/scipy,kleskjr/scipy,ales-erjavec/scipy,jor-/scipy,apbard/scipy,maciejkula/scipy,vanpact/scipy,kleskjr/scipy,sauliusl/scipy,sonnyhu/scipy,richardotis/scipy,zerothi/scipy,scipy/scipy,arokem/scipy,anielsen001/scipy,Stefan-Endres/scipy,minhlongdo/scipy,jonycgn/scipy,nonhermitian/scipy,WillieMaddox/scipy,maniteja123/scipy,jseabold/scipy,vigna/scipy,Srisai85/scipy,zerothi/scipy,juliantaylor/scipy,sriki18/scipy,matthew-brett/scipy,mortada/scipy,sriki18/scipy,mikebenfield/scipy,apbard/scipy,jsilter/scipy,anielsen001/scipy,aeklant/scipy,surhudm/scipy,dominicelse/scipy,aarchiba/scipy,vanpact/scipy,andyfaff/scipy,ilayn/scipy,ogrisel/scipy,andyfaff/scipy,ortylp/scipy,newemailjdm/scipy,e-q/scipy,gfyoung/scipy,josephcslater/scipy,pizzathief/scipy,WillieMaddox/scipy,ndchorley/scipy,zxsted/scipy,mgaitan/scipy,zerothi/scipy,pbrod/scipy,ndchorley/scipy,jamestwebber/scipy,jonycgn/scipy,raoulbq/scipy,rmcgibbo/scipy,dch312/scipy,rgommers/scipy,aman-iitj/scipy,zaxliu/scipy,anntzer/scipy,zxsted/scipy,behzadnouri/scipy,kleskjr/scipy,jonycgn/scipy,andyfaff/scipy,sargas/scipy,jseabold/scipy,Kamp9/scipy,Newman101/scipy,pschella/scipy,raoulbq/scipy,fernand/scipy,rgommers/scipy,jakevdp/scipy,maniteja123/scipy,jjhelmus/scipy,mhogg/scipy,Srisai85/scipy,pnedunuri/scipy,rmcgibbo/scipy,Stefan-Endres/scipy,Eric89GXL/scipy,ChanderG/scipy,andim/scipy,pizzathief/scipy,lukauskas/scipy,mhogg/scipy,sargas/scipy,witcxc/scipy,grlee77/scipy,gdooper/scipy,jamestwebber/scipy,njwilson23/scipy,zerothi/scipy,surhudm/scipy,haudren/scipy,endolith/scipy,mtrbean/scipy,perimosocordiae/scipy,Shaswat27/scipy,jjhelmus/scipy,minhlongdo/scipy,pschella/scipy,giorgiop/scipy,ales-erjavec/scipy,zxsted/scipy,raoulbq/scipy,mikebenfield/scipy,woodscn/scipy,zaxliu/scipy,jonycgn/scipy,e-q/scipy,vberaudi/scipy,mortada/scipy,Dapid/scipy,kleskjr/scipy,nonhermitian/scipy,haudren/scipy,dominicelse/scipy,befelix/scipy,scipy/scipy,bkendzior/scipy,befelix/scipy,ortylp/scipy,pbrod/scipy,futurulus/scipy,giorgiop/scipy,endolith/scipy,kleskjr/scipy,efiring/scipy,mtrbean/scipy,newemailjdm/scipy,mortonjt/scipy,zxsted/scipy,mortonjt/scipy,piyush0609/scipy,bkendzior/scipy,behzadnouri/scipy,Stefan-Endres/scipy,trankmichael/scipy,zerothi/scipy,rmcgibbo/scipy,Shaswat27/scipy,futurulus/scipy,richardotis/scipy,futurulus/scipy,felipebetancur/scipy,pyramania/scipy,mhogg/scipy,nonhermitian/scipy,jor-/scipy,teoliphant/scipy,haudren/scipy,nvoron23/scipy,WarrenWeckesser/scipy,jamestwebber/scipy,pnedunuri/scipy,Dapid/scipy,perimosocordiae/scipy,gfyoung/scipy,rgommers/scipy,minhlongdo/scipy,mdhaber/scipy,mdhaber/scipy,Stefan-Endres/scipy,jakevdp/scipy,futurulus/scipy,sonnyhu/scipy,perimosocordiae/scipy,sargas/scipy,grlee77/scipy,mtrbean/scipy,niknow/scipy,woodscn/scipy,ales-erjavec/scipy,pschella/scipy,piyush0609/scipy,gfyoung/scipy,ChanderG/scipy,endolith/scipy,anntzer/scipy,fredrikw/scipy,dch312/scipy,perimosocordiae/scipy,lukauskas/scipy,pizzathief/scipy,vigna/scipy,tylerjereddy/scipy,Newman101/scipy,mtrbean/scipy,arokem/scipy,gdooper/scipy,zaxliu/scipy,sonnyhu/scipy,aman-iitj/scipy,behzadnouri/scipy,maniteja123/scipy,minhlongdo/scipy,sauliusl/scipy,Gillu13/scipy,WillieMaddox/scipy,tylerjereddy/scipy,nmayorov/scipy,witcxc/scipy,fernand/scipy,mingwpy/scipy,maciejkula/scipy,aarchiba/scipy,e-q/scipy,argriffing/scipy,matthew-brett/scipy,vhaasteren/scipy,arokem/scipy,grlee77/scipy,Gillu13/scipy,aeklant/scipy,efiring/scipy,raoulbq/scipy,teoliphant/scipy,vanpact/scipy,scipy/scipy,futurulus/scipy,ilayn/scipy,trankmichael/scipy,nmayorov/scipy,vberaudi/scipy,surhudm/scipy,mortada/scipy,perimosocordiae/scipy,gertingold/scipy,sargas/scipy,kalvdans/scipy,mhogg/scipy,nmayorov/scipy,gdooper/scipy,andim/scipy,nonhermitian/scipy,ogrisel/scipy,aeklant/scipy,Newman101/scipy,lhilt/scipy,trankmichael/scipy,giorgiop/scipy,piyush0609/scipy,andim/scipy,Srisai85/scipy,Dapid/scipy,person142/scipy,Gillu13/scipy,Kamp9/scipy,sargas/scipy,teoliphant/scipy,person142/scipy,gdooper/scipy,Newman101/scipy,kleskjr/scipy,haudren/scipy,cpaulik/scipy,FRidh/scipy,aman-iitj/scipy,ortylp/scipy,Eric89GXL/scipy,vanpact/scipy,person142/scipy,niknow/scipy,fredrikw/scipy,larsmans/scipy,jor-/scipy,efiring/scipy,jakevdp/scipy