Merge pull request #446 from puppetlabs/daenney/apt-proxy