Merge pull request #2430 from thess/v4l2-update