Drupal 6.27
Merge branch 'vendor6' into drupal6