merge hotfixes from Products.PloneHotfix20131210