plone 4.2.4
merge master