Merge pull request #531 from justinstoller/maint/master/set-puppet-version