Merge pull request #7628 from DocLM/libgphoto2