2.2.18 Merge now in CVS

Version V1 V2  
1 by Raylynn Knight View Revision