Pull in latest changes to CMake modules. [skip ci]