fixes post-rebase
fixes post-rebase

astropy/astropy,bsipocz/astropy,saimn/astropy,astropy/astropy,stargaser/astropy,bsipocz/astropy,larrybradley/astropy,dhomeier/astropy,mhvk/astropy,StuartLittlefair/astropy,StuartLittlefair/astropy,pllim/astropy,larrybradley/astropy,bsipocz/astropy,lpsinger/astropy,bsipocz/astropy,dhomeier/astropy,MSeifert04/astropy,saimn/astropy,lpsinger/astropy,lpsinger/astropy,pllim/astropy,larrybradley/astropy,aleksandr-bakanov/astropy,dhomeier/astropy,astropy/astropy,mhvk/astropy,pllim/astropy,mhvk/astropy,aleksandr-bakanov/astropy,astropy/astropy,lpsinger/astropy,MSeifert04/astropy,aleksandr-bakanov/astropy,saimn/astropy,pllim/astropy,dhomeier/astropy,MSeifert04/astropy,StuartLittlefair/astropy,larrybradley/astropy,stargaser/astropy,mhvk/astropy,saimn/astropy,astropy/astropy,pllim/astropy,dhomeier/astropy,stargaser/astropy,StuartLittlefair/astropy,aleksandr-bakanov/astropy,stargaser/astropy,lpsinger/astropy,mhvk/astropy,MSeifert04/astropy,saimn/astropy,StuartLittlefair/astropy,larrybradley/astropy