[trunk] Import rev 1103 into trunk.