Merge branch 'master' into non-medic-coef
Fixed a missing then
Merge branch 'master' of https://github.com/KoffeinFlummi/AGM