short-circuit test, be more lenient for numpy < 1.7
short-circuit test, be more lenient for numpy < 1.7

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