copied from old
Merge branch 'master' of github.com:efoft/puppet