Drupal 6.32
Merge branch 'vendor6' into drupal6