Minor fix after resolving conflicts
Minor fix after resolving conflicts

stonebig/numba,stonebig/numba,seibert/numba,stuartarchibald/numba,stonebig/numba,IntelLabs/numba,seibert/numba,seibert/numba,stonebig/numba,seibert/numba,gmarkall/numba,IntelLabs/numba,stuartarchibald/numba,sklam/numba,numba/numba,stuartarchibald/numba,cpcloud/numba,cpcloud/numba,cpcloud/numba,gmarkall/numba,sklam/numba,numba/numba,IntelLabs/numba,IntelLabs/numba,numba/numba,numba/numba,numba/numba,IntelLabs/numba,stuartarchibald/numba,cpcloud/numba,gmarkall/numba,sklam/numba,gmarkall/numba,stonebig/numba,gmarkall/numba,stuartarchibald/numba,cpcloud/numba,sklam/numba,sklam/numba,seibert/numba