(#4791)  Use the existin trim() function.
Merge remote-tracking branch 'origin/V8_2-branch'
(#4375)  *couhg*  Add the man page.  *cough*
Merge remote-tracking branch 'origin/V8_3_2-branch'