added ffms demuxer as default for x264
added LC_COLLATE=C to my_env. mkvmerge will not work if the system setting differs
Merge remote-tracking branch 'upstream/master'