trunk-tracking: update from r3949 to r3967