Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	composer.json

composer.json

@@ -77,6 +77,8 @@
         "drupal/security_review": "^2.0||^3.0",
         "drupal/simple_sitemap": "^4.1",
         "drupal/smart_date": "^4.0||^4.1",
+        "drupal/sitemap": "^2.0@beta",
+        "drupal/smart_date": "^4.0",
         "drupal/smtp": "^1.2",
         "drupal/sqrl": "^2.0",
         "drupal/stage_file_proxy": "^2.1",