Merge branch '1.5.x' of https://github.com/puppetlabs/puppetlabs-apt into 1.5.x