Updated for gPhoto 2.5.2