Merge pull request #7237 from lalinsky/vidme2