Merge pull request #4942 from DocLM/gphoto2