r3278 pull the last maintenance commit into trunk