Update patch set for 3.11