Merge "Fix compile time warning."