manual merged from Jaffa 5.11 release branch.
Authored by: SeanZ 2011-10-26
Parent: [r5637]
Child: [r5639]