Merge branch 'dev' into 'testing'

# Conflicts:
#   .gitlab-ci.yml
#   ckanext-theme_hft/ckanext/theme_hft/assets/webassets.yml
#   ckanext-theme_hft/ckanext/theme_hft/templates/base.html
#   ckanext-theme_hft/ckanext/theme_hft/templates/footer.html
1 job for testing in 15 seconds
Status Name Job ID Coverage
  Deploy
passed devel #6971
testing

00:00:15