more mergeback from the latest release

Original commit message from CVS:
more mergeback from the latest release
4 files changed