updated for http
Merge branch 'master' into wide1309