Merge branch 'development' of git:xerus/xerus into development

8 jobs for development in 12 minutes and 52 seconds (queued for 2 seconds)