Cherry-pick "Merge branch 'CMakeVersionUpdates-1.0-20181009' into '1.0'" into master
CMake Version Updates, 1.0 branch (2018.10.09.)
See merge request !360 (merged)
(cherry picked from commit cea14a3f)
CMake Version Updates, 1.0 branch (2018.10.09.)
See merge request !360 (merged)
(cherry picked from commit cea14a3f)