upstream Drupal 7.26

Change-Id: If223414c82fb972adee26e7a467703cbb7f8c5b0
Merge remote-tracking branch 'origin/contrib' into HEAD

Change-Id: I26fbfc083e2f5d39836fd4f5fe46002271781f4a