Merge pull request #8009 from neheb/v4l