Fixes #3488 - Drupal core security update
Merge pull request #3490 from aaronschachter/core_734

Drupal core security update