ffv compatibility, fix #1512
Merge branch 'master' of https://github.com/KoffeinFlummi/AGM