Merge branch 'es/st-add4-gcc-4.2-workaround' into maint