Merge branch 'master', remote branch 'origin'
Merge branch 'master' of github.com:lenfree/puppet
pull-updates.sh added