Implement rate-limiting.
Fix merge conflict with Drupal repository due to a previous push --force.