Merge pull request #837 from puppetlabs/pdksync_pdksync_heads/master-0-g9c815ea