Drupal 6.29
Merge branch 'vendor6' into drupal6