Chris gpu update

Merged Chris Hines requested to merge chris_gpu_update into master

Merge request reports