BUG: Fix various problems in the previous commits.
BUG: Fix various problems in the previous commits.

Thanks to @alan-isaac for pointing out the 0-d vs. scalar issue.

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