GCC 4.8.x fix
Merge pull request #1 from zhuoyang/cm-11.0

GCC 4.8.x fix