Master update

Eric Torrencerequested to merge
master-update into master

Merge Dave's changes back into my branch master. Fixes CMake file syntax updates.

Merge request reports