upstream Drupal 7.26

Change-Id: If223414c82fb972adee26e7a467703cbb7f8c5b0