trunk-tracking: update from r3736 to r3770