self-contained
Merge branch 'master' of https://github.com/jl777/pNXT

Conflicts:
NXTservices/libuv/include/uv.h