Https

Merged Sid Sijbrandij requested to merge https into master