Update CMakeFiles
Merge branch 'master' into transitive_dependencies