Merge from last changes in my old branch
Authored by: formirror 2010-02-05
Parent: [r1304]
Child: [r1306]