fix #1600, fix #1616, fix #1617
Merge branch 'master' of https://github.com/KoffeinFlummi/AGM