Issue #481: Fixes Drupal security issue SA-CORE-2014-006.
Merge pull request #597 from BWPanda/481/SA-CORE-2014-006

Issue #481: Fixes Drupal security issue SA-CORE-2014-006.