Issue #184: Backports for SA-CORE-2012-002.
Issue #183: Backports from Drupal 7.16, SA-CORE-2012-003.
Merge pull request #167 from quicksketch/SA-CORE-2012-002

Issue #184: Backports for SA-CORE-2012-002.
Issue #133: Backports of security updates in Drupal 7.24, SA-CORE-2013-003.
Merge pull request #168 from quicksketch/SA-CORE-2012-003

Issue #183: Backports from Drupal 7.16, SA-CORE-2012-003.
Merge pull request #169 from quicksketch/SA-CORE-2013-003

Issue #133: Backports of security updates in Drupal 7.24, SA-CORE-2013-003.