r2122: merge from trunk (-r 2120):