switched to http
Merge branch 'master' into php5.4