Drupal 6.26
Merge branch 'vendor6' into drupal6