Merge "Fix compilation error by GCC 4.3.3"