Merge branch 'bug_124_m2ts_support'