added PloneHotfix20130618
Merge branch 'master' into stable