Edit comments: ready to merge

We're getting multi requests from Plone folks to merge this feature.

I've merged master and retested OK.

The commit history is a bit polluted by a borked rebase Paul did, which duplicates some commits. The end result should be fine. We're using this stuff in production on a large site since July.