Merge branch 'heads/bugfix-rate-limiting'

3 jobs for master in 20 minutes and 37 seconds (queued for 2 seconds)