Merge pull request #759 from puppetlabs/pdksync_heads/master-0-g34e3266