Fix for older versions of libconfig
Merge branch 'xcpd' into richard_working