Merge branch 'v1.1.x' into scoodle

4 jobs for scoodle in 16 seconds (queued for 2 seconds)