Work on #944; needs testing
Merge branch 'master' of https://github.com/KoffeinFlummi/AGM