Merge "fix compiler warning."