Secure Link

Merged Sid Sijbrandij requested to merge secure-link into master