Fix config parameters
Add CDN config
Merge branch 'master' into 2.0.x