Fixes due to merge master
Fixes due to merge master

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