Merge pull request #618 from puppetlabs/update-modulesync