Merge changes (8576:8587) from trunk to the cli project.
Authored by: yaberauneya 2011-11-05
Parent: [r8588]
Child: [r8590]