Initial fix for issue 2555
Initial fix for issue 2555

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