Merge branch 'master' of github.com:Moliholy/puppet-library