merge from ver1.0 (r2896): fix for #207
merge from ver1.0 (r2896): fix for #207

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