Merge branch 'master' of https://github.com/smartpurposes/puppet-modules
Merge branch 'master' of https://github.com/smartpurposes/puppet-modules