Merge fix for C++11 compilation error