Fix broken automated merge in numba.test().
Fix broken automated merge in numba.test().

sklam/numba,pitrou/numba,IntelLabs/numba,ssarangi/numba,stuartarchibald/numba,pitrou/numba,numba/numba,sklam/numba,cpcloud/numba,shiquanwang/numba,stuartarchibald/numba,GaZ3ll3/numba,stefanseefeld/numba,pombredanne/numba,cpcloud/numba,stonebig/numba,seibert/numba,gmarkall/numba,GaZ3ll3/numba,stuartarchibald/numba,stonebig/numba,gdementen/numba,gdementen/numba,pitrou/numba,ssarangi/numba,stonebig/numba,ssarangi/numba,numba/numba,numba/numba,stefanseefeld/numba,gmarkall/numba,seibert/numba,cpcloud/numba,ssarangi/numba,cpcloud/numba,stefanseefeld/numba,IntelLabs/numba,GaZ3ll3/numba,jriehl/numba,GaZ3ll3/numba,numba/numba,gmarkall/numba,IntelLabs/numba,seibert/numba,seibert/numba,numba/numba,gmarkall/numba,IntelLabs/numba,pombredanne/numba,pombredanne/numba,shiquanwang/numba,stefanseefeld/numba,gdementen/numba,pitrou/numba,GaZ3ll3/numba,gdementen/numba,gdementen/numba,jriehl/numba,pombredanne/numba,jriehl/numba,pombredanne/numba,stuartarchibald/numba,sklam/numba,pitrou/numba,jriehl/numba,cpcloud/numba,stefanseefeld/numba,ssarangi/numba,sklam/numba,sklam/numba,gmarkall/numba,shiquanwang/numba,seibert/numba,IntelLabs/numba,stonebig/numba,stuartarchibald/numba,jriehl/numba,stonebig/numba