8.0.x compatibility

Compatibility with the Drupal 8.0.x HEAD