Cherry-picking gphoto update by Jack Cummings, too