Merge "Fix compilation warning."