Patch V3 from David Barksdale applied.