One more trademark fix
Merge branch 'master' into vorbisfile-cs