Merge "C++17 compatibility: make WITH_TIDY=1 happy again."