fix errors that appeard after rebasing
fix errors that appeard after rebasing

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