Merged changes from main CVS up to 2.1.5