Drupal 6.31 via cherry-pick