Drupal 6.31 via cherry-pick

fixes #82
Merge pull request #83 from pressflow/SA-CORE-2014-002

Drupal 6.31 via cherry-pick
Merge remote-tracking branch 'upstream/master'