deleted http:
deleted http:
Merge branch 'master' into gh-pages