Merge branch 'gcc-problems'