New-line in CHANGES.rst omitted by 3-way merge. [skip ci]
New-line in CHANGES.rst omitted by 3-way merge. [skip ci]

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