2MGFX project update
Merge branch 'master' into vorbisfile-cs