Merging in change from Drupal branch