Merge "Switch to https for most links"