afpstats-service.xml afpstats_service_glue.h were missing in distribution
Merge remote branch 'github/develop' into develop