Merge pull request #7678 from neheb/v4l2