[1.5] Import rev 1053 from trunk over to 1.5