drupal core update
Merge branch '0012-drupal-update' into develop