rm cuz no https
Merge branch 'master' into gh-pages

update from master