Drupal 7.31 security update.
Merge branch 'hotfix/security-core-7.31'