Merge pull request #963 from puppetlabs/pdksync