Incorporate the changes from https://github.com/astropy/astropy-helpers/pull/188 and https://github.com/astropy/astropy-helpers/pull/194 into astropy's copy of the AstropyTest command.
Incorporate the changes from https://github.com/astropy/astropy-helpers/pull/188 and https://github.com/astropy/astropy-helpers/pull/194 into astropy's copy of the AstropyTest command.

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