Merge branch 'hjl/x32/gcc-4_6-branch' into hjl/x32/gcc-4_6-branch+mx32