Merge pull request #3837 from elupus/mpegts