BUG: Fix old case for boolean subscripts with non-matching shape.
BUG: Fix old case for boolean subscripts with non-matching shape.

Conflicts:
	numpy/core/src/multiarray/mapping.c

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