r1395: important merge from 3.0 before rc1