Resync with puppetlabs