Reverted.

That doesn't help, browser won't load scripts over http from a https page.
Merge branch 'master' into gh-pages