Updated trunk feeds, removed obsolete patch.