Plone Hotfix 20131210
merge from upstream
merge conflicts