[heads-up] merging our branch Cocoon-2.1

[David Crossley]

I will get on with merging the branch, hopefully tomorrow.

I expect it to be smooth going, as people have been
working in other parts of the repository.

-David