Document the noCDN option
Merge branch '0.2.x'