Merge branch 'dev' into cuda-dynload

Conflicts:
	opensubdiv/osd/cudaComputeController.cpp
	opensubdiv/osd/cudaKernel.cu