Merge pull request #755 from puppetlabs/pdksync_heads/master-0-gfe44b98