bye bye Lenny; manual changes
===GT=== #3852
Merge branch 'V8_0-branch'