[commits] r1500 - trunk