tomh pushed to catch (master). "Update to 1.11.0 upstream release"