GTESTs CMake configuration error

When running CMake with -DFUNCTESTS=OFF, we get the following error message:

$ cmake -DFUNCTESTS=OFF ..

... omitted content ...

CMake Error at tests/CMakeLists.txt:11 (ADD_TEST):
  ADD_TEST given test NAME "test-test-condfun-nostdlib" which already exists
  in this directory.
Call Stack (most recent call first):
  tests/CMakeLists.txt:49 (REGISTER_TEST)

Does MR !67 (merged) fix this issue at all?