Copying pertinent changes from trunk, 5385, into this branch.
Authored by: mgricken 2010-09-13
Parent: [r5386]
Child: [r5388]