Afterward changes due to rebase conflict
Afterward changes due to rebase conflict

aleksandr-bakanov/astropy,saimn/astropy,bsipocz/astropy,joergdietrich/astropy,astropy/astropy,mhvk/astropy,mhvk/astropy,kelle/astropy,dhomeier/astropy,tbabej/astropy,joergdietrich/astropy,StuartLittlefair/astropy,astropy/astropy,DougBurke/astropy,aleksandr-bakanov/astropy,stargaser/astropy,dhomeier/astropy,larrybradley/astropy,mhvk/astropy,AustereCuriosity/astropy,DougBurke/astropy,mhvk/astropy,lpsinger/astropy,joergdietrich/astropy,AustereCuriosity/astropy,stargaser/astropy,saimn/astropy,pllim/astropy,StuartLittlefair/astropy,AustereCuriosity/astropy,saimn/astropy,saimn/astropy,kelle/astropy,pllim/astropy,dhomeier/astropy,bsipocz/astropy,tbabej/astropy,tbabej/astropy,astropy/astropy,mhvk/astropy,MSeifert04/astropy,MSeifert04/astropy,dhomeier/astropy,aleksandr-bakanov/astropy,stargaser/astropy,pllim/astropy,StuartLittlefair/astropy,kelle/astropy,astropy/astropy,dhomeier/astropy,bsipocz/astropy,funbaker/astropy,DougBurke/astropy,tbabej/astropy,joergdietrich/astropy,kelle/astropy,astropy/astropy,pllim/astropy,AustereCuriosity/astropy,lpsinger/astropy,StuartLittlefair/astropy,larrybradley/astropy,pllim/astropy,StuartLittlefair/astropy,funbaker/astropy,larrybradley/astropy,aleksandr-bakanov/astropy,stargaser/astropy,larrybradley/astropy,DougBurke/astropy,lpsinger/astropy,joergdietrich/astropy,funbaker/astropy,bsipocz/astropy,AustereCuriosity/astropy,saimn/astropy,tbabej/astropy,funbaker/astropy,lpsinger/astropy,larrybradley/astropy,MSeifert04/astropy,lpsinger/astropy,MSeifert04/astropy,kelle/astropy