Merge remote-tracking branch 'upstream/master' into nanovdb-pointstogrid-buffer

Signed-off-by: Mark Harris <mharris@nvidia.com>

# Conflicts:
#	pendingchanges/nanovdb.txt

Author: harrism