@revert to fmodex
Merge branch 'v3.1' of github.com:FSource/Faeris into v3.1