trunk-r3495
