* Merged revisions 4870 & 5005 from trunk, both revisions have patches for well...