Fix for Python 3.x (to do bungled rebase)
Fix for Python 3.x (to do bungled rebase)

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