...
The fact that the development for release 2 may be six months or so means that the final branch->trunk merge in approach 2 may be a complex and difficult task. For this reason, we decided to go with option 1. The CSF 2.0 upgrade project is now taking place, and information can be found here. This page remains for historical purposes.