default settings
Merge branch 'release/2014-08-05'
Drupal 7.31 security update.
Merge branch 'hotfix/security-core-7.31' into dev