Merge branch 'v1.1.x' into scoodle

1 job for scoodle in 19 seconds (queued for 1 second)