Merge remote-tracking branch 'origin/master'

# Conflicts:
#	composer.json

composer.json

@@ -48,9 +48,9 @@
         "drupal/drd_agent": "^3.7",
         "drupal/ds": "^3.1",
         "drupal/elastic_email": "^3.0",
-        "drupal/entity": "^1.0-beta1",
+        "drupal/entity": "^1.0@beta",
         "drupal/extlink": "^1.1",
-        "drupal/field_group": "^3.0-beta1",
+        "drupal/field_group": "^3.0@beta",
         "drupal/honeypot": "^1.29",
         "drupal/linkit": "^5.0",
         "drupal/matomo": "^1.7",
@@ -60,14 +60,14 @@
         "drupal/piwik_noscript": "^1.2",
         "drupal/recaptcha": "^2.3",
         "drupal/redis": "^1.0",
-        "drupal/rules": "^3.0-alpha3",
+        "drupal/rules": "^3.0@alpha",
         "drupal/security_review": "1.x-dev",
         "drupal/simple_sitemap": "^2.12",
-        "drupal/smtp": "^1.0-beta3",
-        "drupal/stage_file_proxy": "^1.0-alpha3",
-        "drupal/subpathauto": "^1.0-beta1",
+        "drupal/smtp": "^1.0@beta",
+        "drupal/stage_file_proxy": "^1.0@alpha",
+        "drupal/subpathauto": "^1.0@beta",
         "drupal/token": "^1.4",
-        "drupal/unlimited_number": "^1.0-beta2",
+        "drupal/unlimited_number": "^1.0@beta",
         "drush/drush": "^9.0"
     },
     "minimum-stability": "dev",