Merge "Fix silly gcc warning."