Merged experimental patch by Rene Zaumseil
Authored by: gumpu 2009-03-16
Parent: [r764]
Child: [r766]