Merge pull request #3691 from naglis/moevideo