[packages_10.03.2] gphoto2: merge r30324