Update to 3.11.1; sync