now in a CDN
Merge remote-tracking branch 'origin/master' into gh-pages