Merge remote-tracking branch 'upstream/next' into next
Merge remote-tracking branch 'upstream/next' into next
Minor update to CMakeLists.txt.
Merge pull request #63 from Fraser999/MAID-500

Minor update to CMakeLists.txt.