Fixes after rebase against master.
Fixes after rebase against master.

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