Updating from puppetlabs original repo.