Copying /trunk to /tags/2.1.10 for release. This is the last feature change to the 2.1.x branch. Trunk now continues towards 2.2.x