Merge "C++17 compatibility."