core updated
Merge branch 'drupal-31' into dev