Merge branch 'tb/avoid-gcc-on-darwin-10-6'