Drupal 6.30
Merge branch 'vendor6' into drupal6