Patch 7

Import Bugfix. The content if the bugfix goes over in the ownership of Plone.