Roll up all changes and resolve CVS/Update Status issue.
Rolling up a few new features (see CVS log).
small bug fix.