Changed config/userguide to preserve comments on variables
Merge branch 'guide' into master-3.3
Fixed invalid properties used