Integrating latest changes from main trunk.
Authored by: cdobre 2011-03-30
Parent: [r2074]
Child: [r2076]