r2260: merging from 3.0 (and updating WHATSNEW)