Upstream update: v1.1.1