Merge branch 'hotfix/analytics'
Merge branch 'develop' of https://github.com/Numerical-Brass/numericalbrass-website into develop