[trunk] merge rev 1333 from 1.5 to trunk