Merging Drupal 7 backports with 1.x branch.