Fix to display https urls properly
Merge branch 'master' into lwi
Merge branch 'lwi' into stats_api_v1