Started work on #918
More work on HUDs
Manual merge
Potential fix for #929 / 1
Merge branch 'master' of https://github.com/KoffeinFlummi/AGM