Merge branch 'bug/gcc-4.4'