Merge pull request #365 from jbondpdx/puppet37

Puppet37