Merge "Workaround for multi-line comment error when compiled with g++."