2.x maintenance branch created

[lenny]

I have created 2.x maintenance branch, main should go 3.x imminently after the 
2.1.1 vote is closed