Fixing error in the use of the "defaults" mechanism.
Merge branch 'fix-charitynet'