move development to Plone 4.2
Merge branch 'master' into working-branch