Fix G++ 4.7 issues
Merge branch 'hellamps-ctemplate-patch-new-compiler'