CDIST_ALLOW_OVERRIDE -> CDIST_OVERRIDE as requested by nico
Merge branch 'origin/feature_object_override' of git://github.com/dheule/cdist