Make update from 3.0 to 3.1 more save.Ticket 2726521
Authored by: tmuenzer 2009-04-02
Parent: [r408]
Child: [r410]