Merge pull request #16361 from stintel/v4l