Fix some errors with recent scalar coercion changes.
Fix some errors with recent scalar coercion changes.

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