Merge pull request #6421 from remitamine/vidme