Merged r971:973 from current_stable (bugs #1950091 and #1951295).
Authored by: knut_f 2008-09-12
Parent: [r973]
Child: [r975]