Update upstream to 1.11.2