merged back fixes from release branch

Original commit message from CVS:
merged back fixes from release branch
8 files changed