Merge pull request #3716 from naglis/nosvideo