[trunk] merge r1323 from branch 1.5 over to trunk