Merged in changes from CVS HEAD