merge rev 1082 from trunk