Merge pull request #724 from wyardley/apt_transport_https2