Fix for older Puppet versions
Merge branch 'master' of github.com:example42/puppi