Contains some Drupal 6 patches