Merge development into master

This merges the latest development code into master.

The main change is the addition of an if-rule to the deployment job so that it deploys if the default branch is called either 'master' or 'main' (instead of just 'master').