Merge branch 'master' into 'release'

# Conflicts:
#   .gitlab-ci.yml
#   .ops/release-request.sh
#   CHANGELOG.md
#   composer.json
#   package.json
#   src/pages/changelog.html