Merge pull request #4489 from DocLM/gphoto2