updated to mater branch
updated to mater branch

merged the changes to the master branch as requested

rgommers/scipy,anielsen001/scipy,nvoron23/scipy,grlee77/scipy,woodscn/scipy,niknow/scipy,pizzathief/scipy,ilayn/scipy,dch312/scipy,chatcannon/scipy,mingwpy/scipy,person142/scipy,larsmans/scipy,argriffing/scipy,larsmans/scipy,cpaulik/scipy,witcxc/scipy,endolith/scipy,WillieMaddox/scipy,ogrisel/scipy,raoulbq/scipy,nvoron23/scipy,aeklant/scipy,juliantaylor/scipy,juliantaylor/scipy,gef756/scipy,mingwpy/scipy,raoulbq/scipy,zxsted/scipy,behzadnouri/scipy,newemailjdm/scipy,lhilt/scipy,bkendzior/scipy,aeklant/scipy,newemailjdm/scipy,richardotis/scipy,andyfaff/scipy,zaxliu/scipy,sonnyhu/scipy,gef756/scipy,FRidh/scipy,mdhaber/scipy,trankmichael/scipy,vberaudi/scipy,Shaswat27/scipy,ilayn/scipy,gertingold/scipy,mortada/scipy,sonnyhu/scipy,jamestwebber/scipy,ChanderG/scipy,aeklant/scipy,gfyoung/scipy,nmayorov/scipy,pbrod/scipy,scipy/scipy,mtrbean/scipy,gdooper/scipy,kleskjr/scipy,arokem/scipy,ndchorley/scipy,jonycgn/scipy,tylerjereddy/scipy,Shaswat27/scipy,anielsen001/scipy,anntzer/scipy,cpaulik/scipy,zerothi/scipy,ales-erjavec/scipy,kalvdans/scipy,pschella/scipy,mortonjt/scipy,apbard/scipy,kleskjr/scipy,endolith/scipy,mtrbean/scipy,matthew-brett/scipy,maciejkula/scipy,andyfaff/scipy,niknow/scipy,matthewalbani/scipy,ogrisel/scipy,dominicelse/scipy,WarrenWeckesser/scipy,minhlongdo/scipy,Dapid/scipy,Shaswat27/scipy,lhilt/scipy,minhlongdo/scipy,andyfaff/scipy,zxsted/scipy,witcxc/scipy,newemailjdm/scipy,giorgiop/scipy,Dapid/scipy,njwilson23/scipy,andim/scipy,e-q/scipy,giorgiop/scipy,zerothi/scipy,fredrikw/scipy,jor-/scipy,grlee77/scipy,ndchorley/scipy,lukauskas/scipy,Dapid/scipy,mortada/scipy,richardotis/scipy,person142/scipy,minhlongdo/scipy,Kamp9/scipy,futurulus/scipy,pnedunuri/scipy,futurulus/scipy,zxsted/scipy,ortylp/scipy,pyramania/scipy,cpaulik/scipy,raoulbq/scipy,ilayn/scipy,rgommers/scipy,matthewalbani/scipy,lukauskas/scipy,perimosocordiae/scipy,kleskjr/scipy,fredrikw/scipy,cpaulik/scipy,trankmichael/scipy,grlee77/scipy,gfyoung/scipy,ogrisel/scipy,mikebenfield/scipy,jakevdp/scipy,felipebetancur/scipy,Newman101/scipy,arokem/scipy,josephcslater/scipy,Gillu13/scipy,aman-iitj/scipy,futurulus/scipy,pschella/scipy,vhaasteren/scipy,maciejkula/scipy,fernand/scipy,WarrenWeckesser/scipy,chatcannon/scipy,maciejkula/scipy,mhogg/scipy,anielsen001/scipy,jor-/scipy,mhogg/scipy,Kamp9/scipy,jseabold/scipy,kalvdans/scipy,efiring/scipy,arokem/scipy,dominicelse/scipy,sriki18/scipy,gfyoung/scipy,gef756/scipy,anielsen001/scipy,fernand/scipy,surhudm/scipy,aarchiba/scipy,vberaudi/scipy,nmayorov/scipy,dch312/scipy,gfyoung/scipy,lukauskas/scipy,futurulus/scipy,maniteja123/scipy,lhilt/scipy,grlee77/scipy,mingwpy/scipy,aman-iitj/scipy,petebachant/scipy,efiring/scipy,nonhermitian/scipy,raoulbq/scipy,ales-erjavec/scipy,jjhelmus/scipy,argriffing/scipy,aman-iitj/scipy,pizzathief/scipy,ChanderG/scipy,rgommers/scipy,Stefan-Endres/scipy,sriki18/scipy,woodscn/scipy,aarchiba/scipy,mdhaber/scipy,surhudm/scipy,giorgiop/scipy,Kamp9/scipy,Shaswat27/scipy,witcxc/scipy,pyramania/scipy,Stefan-Endres/scipy,jonycgn/scipy,kalvdans/scipy,aarchiba/scipy,kleskjr/scipy,fredrikw/scipy,mgaitan/scipy,Gillu13/scipy,mhogg/scipy,kalvdans/scipy,anielsen001/scipy,nmayorov/scipy,anntzer/scipy,lhilt/scipy,larsmans/scipy,pizzathief/scipy,argriffing/scipy,WillieMaddox/scipy,WillieMaddox/scipy,mdhaber/scipy,mortonjt/scipy,sauliusl/scipy,tylerjereddy/scipy,matthewalbani/scipy,Gillu13/scipy,sriki18/scipy,zxsted/scipy,jor-/scipy,mdhaber/scipy,scipy/scipy,Eric89GXL/scipy,gef756/scipy,jamestwebber/scipy,maniteja123/scipy,ndchorley/scipy,ndchorley/scipy,Shaswat27/scipy,rgommers/scipy,andim/scipy,rmcgibbo/scipy,pnedunuri/scipy,mortonjt/scipy,matthew-brett/scipy,haudren/scipy,nonhermitian/scipy,haudren/scipy,sauliusl/scipy,vanpact/scipy,trankmichael/scipy,befelix/scipy,sriki18/scipy,mortonjt/scipy,dch312/scipy,e-q/scipy,pschella/scipy,WarrenWeckesser/scipy,bkendzior/scipy,WillieMaddox/scipy,surhudm/scipy,ndchorley/scipy,pbrod/scipy,zerothi/scipy,Shaswat27/scipy,piyush0609/scipy,ilayn/scipy,fredrikw/scipy,bkendzior/scipy,nonhermitian/scipy,woodscn/scipy,scipy/scipy,Eric89GXL/scipy,mingwpy/scipy,dominicelse/scipy,argriffing/scipy,pizzathief/scipy,fredrikw/scipy,andim/scipy,larsmans/scipy,vhaasteren/scipy,mortada/scipy,Kamp9/scipy,WarrenWeckesser/scipy,vigna/scipy,aeklant/scipy,kleskjr/scipy,juliantaylor/scipy,matthew-brett/scipy,vigna/scipy,jor-/scipy,lhilt/scipy,fernand/scipy,fernand/scipy,pyramania/scipy,cpaulik/scipy,Gillu13/scipy,surhudm/scipy,haudren/scipy,mhogg/scipy,rmcgibbo/scipy,gertingold/scipy,mgaitan/scipy,andim/scipy,kleskjr/scipy,zaxliu/scipy,gertingold/scipy,piyush0609/scipy,person142/scipy,ChanderG/scipy,jjhelmus/scipy,matthewalbani/scipy,pschella/scipy,Srisai85/scipy,hainm/scipy,mortonjt/scipy,sauliusl/scipy,felipebetancur/scipy,maniteja123/scipy,larsmans/scipy,efiring/scipy,FRidh/scipy,giorgiop/scipy,arokem/scipy,Srisai85/scipy,anntzer/scipy,haudren/scipy,andyfaff/scipy,jsilter/scipy,Stefan-Endres/scipy,ales-erjavec/scipy,futurulus/scipy,mgaitan/scipy,Eric89GXL/scipy,jonycgn/scipy,gdooper/scipy,felipebetancur/scipy,sonnyhu/scipy,matthew-brett/scipy,ChanderG/scipy,apbard/scipy,ilayn/scipy,jsilter/scipy,surhudm/scipy,perimosocordiae/scipy,mortonjt/scipy,Srisai85/scipy,apbard/scipy,pbrod/scipy,raoulbq/scipy,witcxc/scipy,Srisai85/scipy,behzadnouri/scipy,jjhelmus/scipy,nonhermitian/scipy,apbard/scipy,ilayn/scipy,andim/scipy,trankmichael/scipy,endolith/scipy,chatcannon/scipy,zaxliu/scipy,rmcgibbo/scipy,ortylp/scipy,Eric89GXL/scipy,kalvdans/scipy,mortada/scipy,gfyoung/scipy,sriki18/scipy,newemailjdm/scipy,mdhaber/scipy,mikebenfield/scipy,sauliusl/scipy,behzadnouri/scipy,petebachant/scipy,e-q/scipy,fernand/scipy,dominicelse/scipy,chatcannon/scipy,Dapid/scipy,mtrbean/scipy,lukauskas/scipy,anielsen001/scipy,felipebetancur/scipy,mortada/scipy,maniteja123/scipy,mhogg/scipy,petebachant/scipy,vhaasteren/scipy,richardotis/scipy,ChanderG/scipy,matthew-brett/scipy,maniteja123/scipy,vigna/scipy,FRidh/scipy,ortylp/scipy,jonycgn/scipy,Eric89GXL/scipy,nvoron23/scipy,woodscn/scipy,newemailjdm/scipy,jamestwebber/scipy,pnedunuri/scipy,giorgiop/scipy,Eric89GXL/scipy,pbrod/scipy,hainm/scipy,jonycgn/scipy,WillieMaddox/scipy,felipebetancur/scipy,befelix/scipy,mdhaber/scipy,pnedunuri/scipy,petebachant/scipy,niknow/scipy,ndchorley/scipy,scipy/scipy,nvoron23/scipy,mgaitan/scipy,jsilter/scipy,WarrenWeckesser/scipy,lukauskas/scipy,pschella/scipy,maciejkula/scipy,befelix/scipy,josephcslater/scipy,vanpact/scipy,pbrod/scipy,mingwpy/scipy,ogrisel/scipy,Dapid/scipy,Srisai85/scipy,efiring/scipy,aeklant/scipy,sonnyhu/scipy,rgommers/scipy,andyfaff/scipy,mhogg/scipy,vhaasteren/scipy,argriffing/scipy,scipy/scipy,vberaudi/scipy,jseabold/scipy,nvoron23/scipy,aarchiba/scipy,Stefan-Endres/scipy,newemailjdm/scipy,person142/scipy,Newman101/scipy,sonnyhu/scipy,jakevdp/scipy,WarrenWeckesser/scipy,Gillu13/scipy,mikebenfield/scipy,bkendzior/scipy,anntzer/scipy,nmayorov/scipy,haudren/scipy,jseabold/scipy,petebachant/scipy,sriki18/scipy,witcxc/scipy,ortylp/scipy,jseabold/scipy,mingwpy/scipy,efiring/scipy,pizzathief/scipy,FRidh/scipy,jseabold/scipy,josephcslater/scipy,josephcslater/scipy,pnedunuri/scipy,jonycgn/scipy,hainm/scipy,jakevdp/scipy,aman-iitj/scipy,matthewalbani/scipy,chatcannon/scipy,surhudm/scipy,perimosocordiae/scipy,dominicelse/scipy,Newman101/scipy,njwilson23/scipy,nonhermitian/scipy,gdooper/scipy,maciejkula/scipy,befelix/scipy,ChanderG/scipy,ales-erjavec/scipy,sonnyhu/scipy,fernand/scipy,mortada/scipy,jamestwebber/scipy,tylerjereddy/scipy,jakevdp/scipy,behzadnouri/scipy,richardotis/scipy,anntzer/scipy,rmcgibbo/scipy,zxsted/scipy,Stefan-Endres/scipy,ortylp/scipy,piyush0609/scipy,rmcgibbo/scipy,trankmichael/scipy,Kamp9/scipy,richardotis/scipy,mgaitan/scipy,Srisai85/scipy,cpaulik/scipy,pyramania/scipy,endolith/scipy,vanpact/scipy,niknow/scipy,njwilson23/scipy,hainm/scipy,zerothi/scipy,gertingold/scipy,anntzer/scipy,tylerjereddy/scipy,vberaudi/scipy,juliantaylor/scipy,sauliusl/scipy,behzadnouri/scipy,maniteja123/scipy,josephcslater/scipy,person142/scipy,woodscn/scipy,efiring/scipy,zaxliu/scipy,juliantaylor/scipy,mtrbean/scipy,gdooper/scipy,jor-/scipy,zerothi/scipy,gef756/scipy,njwilson23/scipy,pnedunuri/scipy,jsilter/scipy,perimosocordiae/scipy,ales-erjavec/scipy,ogrisel/scipy,bkendzior/scipy,piyush0609/scipy,apbard/scipy,aman-iitj/scipy,endolith/scipy,perimosocordiae/scipy,chatcannon/scipy,futurulus/scipy,trankmichael/scipy,mtrbean/scipy,e-q/scipy,mikebenfield/scipy,njwilson23/scipy,vigna/scipy,niknow/scipy,behzadnouri/scipy,vanpact/scipy,perimosocordiae/scipy,mtrbean/scipy,felipebetancur/scipy,minhlongdo/scipy,endolith/scipy,zerothi/scipy,Newman101/scipy,tylerjereddy/scipy,gef756/scipy,zaxliu/scipy,scipy/scipy,andim/scipy,Newman101/scipy,pyramania/scipy,nmayorov/scipy,vanpact/scipy,minhlongdo/scipy,jsilter/scipy,larsmans/scipy,mikebenfield/scipy,fredrikw/scipy,argriffing/scipy,zaxliu/scipy,njwilson23/scipy,ales-erjavec/scipy,jakevdp/scipy,andyfaff/scipy,FRidh/scipy,Newman101/scipy,vhaasteren/scipy,zxsted/scipy,Stefan-Endres/scipy,minhlongdo/scipy,gdooper/scipy,Kamp9/scipy,gertingold/scipy,jamestwebber/scipy,jjhelmus/scipy,ortylp/scipy,pbrod/scipy,Dapid/scipy,vberaudi/scipy,nvoron23/scipy,piyush0609/scipy,e-q/scipy,niknow/scipy,jseabold/scipy,petebachant/scipy,richardotis/scipy,grlee77/scipy,Gillu13/scipy,arokem/scipy,hainm/scipy,haudren/scipy,FRidh/scipy,giorgiop/scipy,hainm/scipy,jjhelmus/scipy,vberaudi/scipy,raoulbq/scipy,rmcgibbo/scipy,mgaitan/scipy,woodscn/scipy,WillieMaddox/scipy,vanpact/scipy,vhaasteren/scipy,aman-iitj/scipy,piyush0609/scipy,lukauskas/scipy,dch312/scipy,vigna/scipy,befelix/scipy,dch312/scipy,sauliusl/scipy,aarchiba/scipy