task #00020-Modules_update: Drupal core update
Merge branch '00020-Modules_update' into develop