Merge "Fixed x86 GCC 4.6 compilation error about unused variable"