Code

Merged branch 'lenny' into master.