trunk-tracking: update to r3581 (from r3537)