Merge branch 'staging' into 'develop'
# Conflicts: # .gitignore # .gitlab-ci.yml # README.md # gatsby-config.js # src/components/ContactForm.js # src/components/Hero/ServiceCatHero.js # src/components/MegaMenu/MegaMenuContent.js # src/components/styleguide/GridColumns.js # src/components/styleguide/index.js # src/content/service-detail/cloud-one.md # src/data/hero/cloud-one.yaml # src/pages/style-guide.js