Issue #180: Drupal 7.27 release backports.
Merge pull request #340 from quicksketch/180/drupal727

Issue #180: Drupal 7.27 release backports.