incorporate changes from rgommers' diff
incorporate changes from rgommers' diff

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