Unforce HTTPS
Merge