Merge pull request #7708 from twomice/drupal8