Merge branch 'es/st-add4-gcc-4.2-workaround' into maint * es/st-add4-gcc-4.2-workaround: git-compat-util: st_add4: work around gcc 4.2.x compiler crash