patch for latest trunk