MAINT: Fixup merge mistakes
MAINT: Fixup merge mistakes

solarjoe/numpy,dwillmer/numpy,charris/numpy,andsor/numpy,behzadnouri/numpy,pyparallel/numpy,ChristopherHogan/numpy,gmcastil/numpy,maniteja123/numpy,rherault-insa/numpy,MichaelAquilina/numpy,embray/numpy,ddasilva/numpy,ChanderG/numpy,felipebetancur/numpy,ChristopherHogan/numpy,SunghanKim/numpy,CMartelLML/numpy,mwiebe/numpy,dato-code/numpy,madphysicist/numpy,skymanaditya1/numpy,dimasad/numpy,drasmuss/numpy,chatcannon/numpy,Linkid/numpy,ogrisel/numpy,bringingheavendown/numpy,ddasilva/numpy,felipebetancur/numpy,drasmuss/numpy,chiffa/numpy,GrimDerp/numpy,bertrand-l/numpy,drasmuss/numpy,BabeNovelty/numpy,andsor/numpy,mortada/numpy,rmcgibbo/numpy,MSeifert04/numpy,dwillmer/numpy,pdebuyl/numpy,argriffing/numpy,pdebuyl/numpy,cjermain/numpy,leifdenby/numpy,pbrod/numpy,bertrand-l/numpy,naritta/numpy,ESSS/numpy,WarrenWeckesser/numpy,jschueller/numpy,Srisai85/numpy,mhvk/numpy,bertrand-l/numpy,ssanderson/numpy,jschueller/numpy,madphysicist/numpy,Eric89GXL/numpy,musically-ut/numpy,seberg/numpy,tdsmith/numpy,tacaswell/numpy,Dapid/numpy,MichaelAquilina/numpy,kirillzhuravlev/numpy,skwbc/numpy,ssanderson/numpy,NextThought/pypy-numpy,felipebetancur/numpy,rherault-insa/numpy,rhythmsosad/numpy,rhythmsosad/numpy,ogrisel/numpy,yiakwy/numpy,jankoslavic/numpy,rudimeier/numpy,utke1/numpy,sinhrks/numpy,kiwifb/numpy,GaZ3ll3/numpy,moreati/numpy,endolith/numpy,bringingheavendown/numpy,moreati/numpy,grlee77/numpy,gfyoung/numpy,chiffa/numpy,brandon-rhodes/numpy,Anwesh43/numpy,has2k1/numpy,sigma-random/numpy,madphysicist/numpy,mindw/numpy,has2k1/numpy,WillieMaddox/numpy,Anwesh43/numpy,seberg/numpy,GrimDerp/numpy,skwbc/numpy,embray/numpy,pbrod/numpy,rherault-insa/numpy,larsmans/numpy,ahaldane/numpy,numpy/numpy,cowlicks/numpy,githubmlai/numpy,sonnyhu/numpy,bmorris3/numpy,ESSS/numpy,numpy/numpy,ajdawson/numpy,nguyentu1602/numpy,Yusa95/numpy,rgommers/numpy,nbeaver/numpy,mathdd/numpy,pizzathief/numpy,WarrenWeckesser/numpy,WillieMaddox/numpy,numpy/numpy,SunghanKim/numpy,ChanderG/numpy,pbrod/numpy,simongibbons/numpy,jonathanunderwood/numpy,rajathkumarmp/numpy,rudimeier/numpy,cowlicks/numpy,hainm/numpy,mwiebe/numpy,jorisvandenbossche/numpy,endolith/numpy,pizzathief/numpy,MichaelAquilina/numpy,ajdawson/numpy,mwiebe/numpy,ContinuumIO/numpy,abalkin/numpy,pyparallel/numpy,Yusa95/numpy,SunghanKim/numpy,naritta/numpy,Eric89GXL/numpy,ajdawson/numpy,immerrr/numpy,abalkin/numpy,ChristopherHogan/numpy,rmcgibbo/numpy,empeeu/numpy,CMartelLML/numpy,stuarteberg/numpy,ChanderG/numpy,utke1/numpy,BabeNovelty/numpy,charris/numpy,grlee77/numpy,Anwesh43/numpy,Dapid/numpy,KaelChen/numpy,KaelChen/numpy,empeeu/numpy,grlee77/numpy,MaPePeR/numpy,AustereCuriosity/numpy,simongibbons/numpy,simongibbons/numpy,pyparallel/numpy,immerrr/numpy,nguyentu1602/numpy,tynn/numpy,mindw/numpy,githubmlai/numpy,mathdd/numpy,mattip/numpy,simongibbons/numpy,bmorris3/numpy,KaelChen/numpy,shoyer/numpy,immerrr/numpy,SiccarPoint/numpy,dato-code/numpy,pbrod/numpy,naritta/numpy,WarrenWeckesser/numpy,jorisvandenbossche/numpy,rmcgibbo/numpy,cjermain/numpy,larsmans/numpy,kirillzhuravlev/numpy,Yusa95/numpy,has2k1/numpy,mindw/numpy,ekalosak/numpy,Eric89GXL/numpy,behzadnouri/numpy,shoyer/numpy,andsor/numpy,mortada/numpy,rhythmsosad/numpy,ogrisel/numpy,mathdd/numpy,seberg/numpy,pizzathief/numpy,jankoslavic/numpy,dch312/numpy,yiakwy/numpy,jakirkham/numpy,Srisai85/numpy,trankmichael/numpy,dch312/numpy,musically-ut/numpy,numpy/numpy,sinhrks/numpy,bmorris3/numpy,solarjoe/numpy,ChristopherHogan/numpy,tacaswell/numpy,ajdawson/numpy,embray/numpy,solarjoe/numpy,larsmans/numpy,Srisai85/numpy,sinhrks/numpy,mattip/numpy,mathdd/numpy,gfyoung/numpy,tacaswell/numpy,sonnyhu/numpy,endolith/numpy,mattip/numpy,jankoslavic/numpy,rajathkumarmp/numpy,kirillzhuravlev/numpy,utke1/numpy,pdebuyl/numpy,moreati/numpy,embray/numpy,dimasad/numpy,shoyer/numpy,BabeNovelty/numpy,hainm/numpy,BMJHayward/numpy,cowlicks/numpy,ViralLeadership/numpy,endolith/numpy,ekalosak/numpy,empeeu/numpy,cjermain/numpy,trankmichael/numpy,rajathkumarmp/numpy,ahaldane/numpy,anntzer/numpy,empeeu/numpy,sonnyhu/numpy,dimasad/numpy,gmcastil/numpy,jankoslavic/numpy,BabeNovelty/numpy,NextThought/pypy-numpy,SunghanKim/numpy,groutr/numpy,njase/numpy,maniteja123/numpy,njase/numpy,tdsmith/numpy,pdebuyl/numpy,kiwifb/numpy,madphysicist/numpy,b-carter/numpy,KaelChen/numpy,mattip/numpy,WarrenWeckesser/numpy,seberg/numpy,ContinuumIO/numpy,jschueller/numpy,tdsmith/numpy,andsor/numpy,ogrisel/numpy,cowlicks/numpy,Yusa95/numpy,musically-ut/numpy,rgommers/numpy,pbrod/numpy,simongibbons/numpy,groutr/numpy,leifdenby/numpy,ssanderson/numpy,BMJHayward/numpy,SiccarPoint/numpy,njase/numpy,dch312/numpy,MaPePeR/numpy,ekalosak/numpy,pizzathief/numpy,BMJHayward/numpy,ESSS/numpy,larsmans/numpy,sigma-random/numpy,ahaldane/numpy,mingwpy/numpy,jakirkham/numpy,kirillzhuravlev/numpy,MSeifert04/numpy,jschueller/numpy,immerrr/numpy,CMartelLML/numpy,leifdenby/numpy,WillieMaddox/numpy,skymanaditya1/numpy,hainm/numpy,nguyentu1602/numpy,felipebetancur/numpy,mhvk/numpy,WarrenWeckesser/numpy,groutr/numpy,GaZ3ll3/numpy,anntzer/numpy,dato-code/numpy,jakirkham/numpy,mingwpy/numpy,mhvk/numpy,jorisvandenbossche/numpy,stuarteberg/numpy,yiakwy/numpy,jorisvandenbossche/numpy,ddasilva/numpy,githubmlai/numpy,joferkington/numpy,rhythmsosad/numpy,rudimeier/numpy,Dapid/numpy,jakirkham/numpy,maniteja123/numpy,mhvk/numpy,ContinuumIO/numpy,rajathkumarmp/numpy,trankmichael/numpy,kiwifb/numpy,joferkington/numpy,skwbc/numpy,grlee77/numpy,SiccarPoint/numpy,chiffa/numpy,bringingheavendown/numpy,dimasad/numpy,nbeaver/numpy,charris/numpy,madphysicist/numpy,stuarteberg/numpy,Linkid/numpy,trankmichael/numpy,jonathanunderwood/numpy,tynn/numpy,sigma-random/numpy,mindw/numpy,AustereCuriosity/numpy,Linkid/numpy,mingwpy/numpy,NextThought/pypy-numpy,MSeifert04/numpy,mortada/numpy,Anwesh43/numpy,rmcgibbo/numpy,tdsmith/numpy,MichaelAquilina/numpy,MSeifert04/numpy,ViralLeadership/numpy,skymanaditya1/numpy,joferkington/numpy,MaPePeR/numpy,ChanderG/numpy,musically-ut/numpy,mhvk/numpy,Eric89GXL/numpy,rgommers/numpy,GaZ3ll3/numpy,dch312/numpy,joferkington/numpy,naritta/numpy,ahaldane/numpy,nguyentu1602/numpy,pizzathief/numpy,rudimeier/numpy,dwillmer/numpy,b-carter/numpy,Srisai85/numpy,GaZ3ll3/numpy,jakirkham/numpy,sinhrks/numpy,Linkid/numpy,MSeifert04/numpy,sigma-random/numpy,mortada/numpy,shoyer/numpy,AustereCuriosity/numpy,brandon-rhodes/numpy,grlee77/numpy,MaPePeR/numpy,behzadnouri/numpy,ViralLeadership/numpy,mingwpy/numpy,CMartelLML/numpy,cjermain/numpy,charris/numpy,shoyer/numpy,ahaldane/numpy,dwillmer/numpy,chatcannon/numpy,gfyoung/numpy,has2k1/numpy,skymanaditya1/numpy,rgommers/numpy,jorisvandenbossche/numpy,hainm/numpy,anntzer/numpy,tynn/numpy,githubmlai/numpy,GrimDerp/numpy,embray/numpy,BMJHayward/numpy,ekalosak/numpy,anntzer/numpy,NextThought/pypy-numpy,ogrisel/numpy,argriffing/numpy,abalkin/numpy,nbeaver/numpy,brandon-rhodes/numpy,argriffing/numpy,dato-code/numpy,chatcannon/numpy,bmorris3/numpy,stuarteberg/numpy,GrimDerp/numpy,b-carter/numpy,yiakwy/numpy,jonathanunderwood/numpy,SiccarPoint/numpy,sonnyhu/numpy,brandon-rhodes/numpy,gmcastil/numpy