Fix merge issue after rebase master
Fix merge issue after rebase master

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