Merge Puppetlabs Master