Merge new upstream release v1.0.11.