Drupal 7.34
Merge branch '7.34-drupal'