Merge "C++17 compatibility: add a non-const char* overload."