Merge branch 'v1.1.x' into scoodle

1 job for scoodle in 1 minute and 6 seconds (queued for 3 seconds)