merge the formfield patch from ooo-build