Merging Drupal 6.30