revert commit 6710. It was supposed to go into the 2.0.1 branch
backported patch 5094 (correctly expand 2D data to 3D)
implemented compatibility with new Intersection Iterator interface to allow the use of trunk and release for a while.
removed accidentally added method affine.
Merged README changes -r 5017:5019 from trunk