Use c-style comments instead of c++ in the latest merge