Fixes after rebase
Fixes after rebase

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