more magic
Merge branch 'master' into gw2api-import