Update from Puppetlabs master